Discharge7443/brave-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated patches from Chromium 103.0.5060.13 to Chromium 103.0.5060.22.

Browse Source
This commit is contained in:
Claudio DeSouza
2022-06-10 05:58:25 -04:00
committed by Emerick Rogul
parent 0cb8efdcc4
commit eeb333f79e
11 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
patches/chrome-android-java-AndroidManifest.xml.patch
+7 -7
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
index 8cf03aa889ddfc934eaf3221fcce73d16cb68a1e..4efe1038e7d910f25d31ed88b2ee42bb940458cc 100644
index 8cf03aa889ddfc934eaf3221fcce73d16cb68a1e..dcfc01a9a3c6da7173f6412c1ad9a6a0a211b93b 100644
--- a/chrome/android/java/AndroidManifest.xml
+++ b/chrome/android/java/AndroidManifest.xml
@@ -26,6 +26,7 @@ by a child template that "extends" this file.
@@ -41,7 +41,7 @@ index 8cf03aa889ddfc934eaf3221fcce73d16cb68a1e..4efe1038e7d910f25d31ed88b2ee42bb
<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
<uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
@@ -79,7 +87,9 @@ by a child template that "extends" this file.
@@ -79,7 +88,9 @@ by a child template that "extends" this file.
<uses-permission-sdk-23 android:name="android.permission.READ_MEDIA_VIDEO"/>
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
<uses-permission android:name="android.permission.RECORD_AUDIO"/>
@@ -52,7 +52,7 @@ index 8cf03aa889ddfc934eaf3221fcce73d16cb68a1e..4efe1038e7d910f25d31ed88b2ee42bb
<uses-permission-sdk-23 android:name="android.permission.USE_BIOMETRIC"/>
<uses-permission-sdk-23 android:name="android.permission.USE_FINGERPRINT"/>
<uses-permission android:name="android.permission.VIBRATE"/>
@@ -124,7 +134,9 @@ by a child template that "extends" this file.
@@ -124,7 +135,9 @@ by a child template that "extends" this file.
<uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
<uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT"/>
@@ -63,7 +63,7 @@ index 8cf03aa889ddfc934eaf3221fcce73d16cb68a1e..4efe1038e7d910f25d31ed88b2ee42bb
{% block extra_uses_permissions %}
{% endblock %}
@@ -171,6 +183,7 @@ by a child template that "extends" this file.
@@ -171,6 +184,7 @@ by a child template that "extends" this file.
<!-- Set android:largeHeap to "true" to allow more than the default
Java heap limit (32Mb on Nexus S, 48Mb on Xoom). -->
<application android:name="{% block application_name %}org.chromium.chrome.browser.base.SplitChromeApplication{% endblock %}"
@@ -71,7 +71,7 @@ index 8cf03aa889ddfc934eaf3221fcce73d16cb68a1e..4efe1038e7d910f25d31ed88b2ee42bb
android:icon="@drawable/ic_launcher"
android:roundIcon="@drawable/ic_launcher_round"
android:label="{% block application_label %}@string/app_name{% endblock %}"
@@ -327,6 +340,7 @@ by a child template that "extends" this file.
@@ -327,6 +341,7 @@ by a child template that "extends" this file.
<intent-filter>
<action android:name="com.sec.android.airview.HOVER" />
</intent-filter>
@@ -79,7 +79,7 @@ index 8cf03aa889ddfc934eaf3221fcce73d16cb68a1e..4efe1038e7d910f25d31ed88b2ee42bb
<meta-data android:name="android.app.searchable"
android:resource="@xml/searchable" />
</activity-alias>
@@ -1211,6 +1225,7 @@ by a child template that "extends" this file.
@@ -1211,6 +1226,7 @@ by a child template that "extends" this file.
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize" >
</activity>
@@ -87,7 +87,7 @@ index 8cf03aa889ddfc934eaf3221fcce73d16cb68a1e..4efe1038e7d910f25d31ed88b2ee42bb
{% block extra_application_definitions %}
{% endblock %}
{% endmacro %}
@@ -1289,6 +1304,7 @@ by a child template that "extends" this file.
@@ -1289,6 +1305,7 @@ by a child template that "extends" this file.
<!-- ARCore APK integration -->
<!-- This tag indicates that this application optionally uses ARCore. -->
<meta-data android:name="com.google.ar.core" android:value="optional" />
patches/chrome-browser-BUILD.gn.patch
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index 4618d52dd4aa76607b4fd157fcf68dbd56922f39..260869ff9b3f448d9c69f014964e919d4f6494b5 100644
index 631420eb56152a3de776c0abdb6836ca992f6602..3ed76cdbcff87c337997f9bc07d75142704e5127 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -2624,6 +2624,7 @@ static_library("browser") {
@@ -2626,6 +2626,7 @@ static_library("browser") {
"performance_monitor/metric_evaluator_helper_posix.h",
]
}
patches/chrome-browser-about_flags.cc.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 16c831158d1ad46e68806c6f49cc5a213d0ddd9f..82492147c8bf05ae69e43abe649b2be0f9c1cfa2 100644
index bee1d114bf9a05c29f2143539368e619f86244c7..bdcf0870714e555f7770e331dcb30f4d9f6e536b 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -3132,6 +3132,7 @@ const FeatureEntry::FeatureVariation kDesktopSharePreviewVariations[] = {
patches/chrome-browser-global_keyboard_shortcuts_mac.mm.patch
+1 -1
View File
@@ -2,7 +2,7 @@ diff --git a/chrome/browser/global_keyboard_shortcuts_mac.mm b/chrome/browser/gl
index c766aadf8d462733636874d383c588a7f88bf9f0..8002baaa150199e26f11cb0702df920cecd90cb5 100644
--- a/chrome/browser/global_keyboard_shortcuts_mac.mm
+++ b/chrome/browser/global_keyboard_shortcuts_mac.mm
@@ -180,6 +180,7 @@ const std::vector<KeyboardShortcutData>& GetShortcutsNotPresentInMainMenu() {
@@ -180,6 +180,7 @@ CommandForKeyEventResult ShortcutCommand(int cmd) {
{true, false, false, true, kVK_DownArrow, IDC_FOCUS_NEXT_PANE},
{true, false, false, true, kVK_UpArrow, IDC_FOCUS_PREVIOUS_PANE},
{true, true, false, true, kVK_ANSI_A, IDC_FOCUS_INACTIVE_POPUP_FOR_ACCESSIBILITY},
patches/chrome-browser-ui-BUILD.gn.patch
+3 -3
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
index 87a0e51cf2dca64c7c323765827c691e3a63feda..d0f0a136b0605b18f55e125eaf24cbc2a5ed726c 100644
index a0e2bd01e240c4987c27f7807f79a2bee339db36..393d9681c0351b1d872339c08694c1a3a45493ec 100644
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -662,6 +662,7 @@ static_library("ui") {
@@ -663,6 +663,7 @@ static_library("ui") {
"//ui/webui",
"//v8:v8_version",
]
@@ -10,7 +10,7 @@ index 87a0e51cf2dca64c7c323765827c691e3a63feda..d0f0a136b0605b18f55e125eaf24cbc2
# TODO(crbug/925153): Remove this circular dependency.
allow_circular_includes_from = [
@@ -3846,10 +3847,13 @@ static_library("ui") {
@@ -3847,10 +3848,13 @@ static_library("ui") {
]
deps += [ "//google_update" ]
} else {
patches/chrome-browser-ui-cocoa-accelerators_cocoa.mm.patch
+1 -1
View File
@@ -2,7 +2,7 @@ diff --git a/chrome/browser/ui/cocoa/accelerators_cocoa.mm b/chrome/browser/ui/c
index c76c8571b836b3b7c32eecda158f75878b80b302..737a5864eb4f0c379221274bec03105190ef96d5 100644
--- a/chrome/browser/ui/cocoa/accelerators_cocoa.mm
+++ b/chrome/browser/ui/cocoa/accelerators_cocoa.mm
@@ -40,6 +40,8 @@ const struct AcceleratorMapping {
@@ -40,6 +40,8 @@
ui::VKEY_N},
{IDC_NEW_TAB, ui::EF_COMMAND_DOWN, ui::VKEY_T},
{IDC_NEW_WINDOW, ui::EF_COMMAND_DOWN, ui::VKEY_N},
patches/chrome-browser-ui-cocoa-main_menu_builder.mm.patch
+2 -2
View File
@@ -2,7 +2,7 @@ diff --git a/chrome/browser/ui/cocoa/main_menu_builder.mm b/chrome/browser/ui/co
index 9b3d5ab43e17e301f3021257d68d6a6949f5f642..30f0871f06df6c69b5685f5273b6530e2b4327f2 100644
--- a/chrome/browser/ui/cocoa/main_menu_builder.mm
+++ b/chrome/browser/ui/cocoa/main_menu_builder.mm
@@ -108,6 +108,7 @@ base::scoped_nsobject<NSMenuItem> BuildFileMenu(
@@ -108,6 +108,7 @@
Item(IDS_NEW_INCOGNITO_WINDOW_MAC)
.command_id(IDC_NEW_INCOGNITO_WINDOW)
.remove_if(is_pwa),
@@ -10,7 +10,7 @@ index 9b3d5ab43e17e301f3021257d68d6a6949f5f642..30f0871f06df6c69b5685f5273b6530e
Item(IDS_REOPEN_CLOSED_TABS_MAC)
.command_id(IDC_RESTORE_TAB)
.remove_if(is_pwa),
@@ -486,6 +487,7 @@ base::scoped_nsobject<NSMenuItem> BuildHelpMenu(
@@ -486,6 +487,7 @@
#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
Item(IDS_FEEDBACK_MAC).command_id(IDC_FEEDBACK),
#endif
patches/chrome-browser-web_applications-os_integration-web_app_shortcut_mac.mm.patch
+1 -1
View File
@@ -2,7 +2,7 @@ diff --git a/chrome/browser/web_applications/os_integration/web_app_shortcut_mac
index 6b4fc626d07ffdd97e0e36fb052043a8ef088476..917c53653b877cd5c3e349c4bb81c0552dbb9762 100644
--- a/chrome/browser/web_applications/os_integration/web_app_shortcut_mac.mm
+++ b/chrome/browser/web_applications/os_integration/web_app_shortcut_mac.mm
@@ -793,6 +793,7 @@ base::FilePath GetChromeAppsFolder() {
@@ -793,6 +793,7 @@ bool AppShimLaunchDisabled() {
if (path.empty())
return path;
patches/chrome-test-BUILD.gn.patch
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index 72cec19a67038db2b64eb56ef71ccb7a6748d502..a057fba8029bd6e3a56f2c513d605d115b8a921b 100644
index 2675b85b5b86a464b908f1e0af380307ef4b1526..9710144c6429dced975ee5cc48b9e4d3b034ce8c 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -308,6 +308,7 @@ static_library("test_support") {
patches/components-os_crypt-keychain_password_mac.mm.patch
+1 -1
View File
@@ -2,7 +2,7 @@ diff --git a/components/os_crypt/keychain_password_mac.mm b/components/os_crypt/
index 5589310e2e1f41a6a97e77bb57a7a71cd09a18be..af1be3edb2b6135bf93c5fdd42781a92a32ddb9a 100644
--- a/components/os_crypt/keychain_password_mac.mm
+++ b/components/os_crypt/keychain_password_mac.mm
@@ -64,12 +64,14 @@ std::string AddRandomPasswordToKeychain(const AppleKeychain& keychain,
@@ -64,12 +64,14 @@
// static
KeychainPassword::KeychainNameType& KeychainPassword::GetServiceName() {
patches/ios-chrome-browser-sync-sync_service_factory.mm.patch
+1 -1
View File
@@ -2,7 +2,7 @@ diff --git a/ios/chrome/browser/sync/sync_service_factory.mm b/ios/chrome/browse
index 4be5148aec4fdea8404a4ed0976a4980e70f01d5..49cf2f6fe2be7af0208458eae8ae46bd5d90923d 100644
--- a/ios/chrome/browser/sync/sync_service_factory.mm
+++ b/ios/chrome/browser/sync/sync_service_factory.mm
@@ -155,7 +155,7 @@ std::unique_ptr<KeyedService> SyncServiceFactory::BuildServiceInstanceFor(
@@ -155,7 +155,7 @@
policy_connector ? policy_connector->GetPolicyService() : nullptr;
auto sync_service =