Skip to content

Commit 732e509

Browse files
cdesouza-chromiumcdesouza-chromium
committed
Update patches from Chromium 137.0.7151.16 to Chromium 138.0.7170.1.
1 parent 2d03a32 commit 732e509

File tree

155 files changed

+342
-342
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

155 files changed

+342
-342
lines changed

‎patches/base-BUILD.gn.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
diff --git a/base/BUILD.gn b/base/BUILD.gn
2-
index 59721ed3c9e26fd83c553d82030f3e76af0c3dfd..b2410fbcf74cadf48a20fbcb23aa4c744e523a6e 100644
2+
index 34f4bc9ac4d03ad40af9f08c9985d7afe4b37133..a857ab2ab9b9fb446ebd5afc13da16584fbab5c0 100644
33
--- a/base/BUILD.gn
44
+++ b/base/BUILD.gn
5-
@@ -4628,6 +4628,7 @@ if (is_android) {
5+
@@ -4633,6 +4633,7 @@ if (is_android) {
66
"android/java/src/org/chromium/base/UserDataHost.java",
77
"android/java/src/org/chromium/base/ValueChangedCallback.java",
88
]
99
+ sources += brave_java_base_sources
1010

1111
resources_package = "org.chromium.base"
1212

13-
@@ -5273,6 +5274,7 @@ if (is_android) {
13+
@@ -5278,6 +5279,7 @@ if (is_android) {
1414
"android/java/src/org/chromium/base/shared_preferences/SharedPreferencesManager.java",
1515
"android/java/src/org/chromium/base/shared_preferences/StrictPreferenceKeyChecker.java",
1616
]

‎patches/base-threading-thread_restrictions.h.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/base/threading/thread_restrictions.h b/base/threading/thread_restrictions.h
2-
index 59d6e6e4d899f10d1adeb4f23c32f0dd565cf963..87c9ed0860b2de59f524d61372caa05f64ec3aa4 100644
2+
index b1abcfaab58df4555d3a26481915d64ef5458e17..a579b45d65c838b61355ffb898e852ab34f341b6 100644
33
--- a/base/threading/thread_restrictions.h
44
+++ b/base/threading/thread_restrictions.h
5-
@@ -723,6 +723,7 @@ class BASE_EXPORT ScopedAllowBaseSyncPrimitives {
5+
@@ -729,6 +729,7 @@ class BASE_EXPORT ScopedAllowBaseSyncPrimitives {
66
ScopedAllowBaseSyncPrimitives& operator=(
77
const ScopedAllowBaseSyncPrimitives&) = delete;
88

‎patches/build-config-android-config.gni.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/build/config/android/config.gni b/build/config/android/config.gni
2-
index c86e623b7c3a77534e2fee24c6bdc9082901f941..8bb06f32173c4266d7b1ed62a7725e2e19b0e9c2 100644
2+
index 579d66ff54fd9250672c8a4c16d1fd1bd738d4b8..9a50822c73d398b133b2b0b1451db67c8b94b129 100644
33
--- a/build/config/android/config.gni
44
+++ b/build/config/android/config.gni
5-
@@ -29,6 +29,7 @@ assert(!(incremental_install && !is_java_debug),
5+
@@ -31,6 +31,7 @@ assert(!(incremental_install && !is_java_debug),
66
robolectric_toolchain = "//build/toolchain/android:robolectric_$host_cpu"
77

88
if (is_android) {

‎patches/build-config-android-internal_rules.gni.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni
2-
index ee1051ec61fe56491e9a069ea5947136a7d4f41b..93ed3e3e83200bc0baf5509858f8a20ecc3fe990 100644
2+
index 56b4af70c4adbf19193689084ccc85e5c1f60591..ff46f65b8f98ae0bf2b25e0815d98db9c1a936fd 100644
33
--- a/build/config/android/internal_rules.gni
44
+++ b/build/config/android/internal_rules.gni
5-
@@ -3532,6 +3532,7 @@ if (enable_java_templates) {
5+
@@ -3538,6 +3538,7 @@ if (enable_java_templates) {
66
} else if (_has_sources) {
77
# Filter directly in compile_java.py when no other processing is required.
88
_processed_jar_path = _javac_jar_path
99
+ foreach(bytecode_jar, brave_bytecode_jars) { if (rebase_path(_javac_jar_path, root_build_dir) == bytecode_jar) { _processed_jar_path = "$target_out_dir/$target_name.bytecode-rewritten.jar" } }
1010
}
1111

1212
if (_build_device_jar) {
13-
@@ -4075,6 +4076,7 @@ if (enable_java_templates) {
13+
@@ -4080,6 +4081,7 @@ if (enable_java_templates) {
1414
} else {
1515
not_needed(invoker, [ "missing_classes_allowlist" ])
1616
}

‎patches/build-config-android-rules.gni.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
2-
index f43fcfa7f01afd3c11a5efdd26c1a5faf880eda8..8426d29c3a0677cf557d92fc2b3e8866855454ea 100644
2+
index 42d2665a9280e25a00372dc7f9d36826542310e3..6e18d0c9d3ff38c6470083a2eb2be6d20c948cb2 100644
33
--- a/build/config/android/rules.gni
44
+++ b/build/config/android/rules.gni
55
@@ -208,6 +208,7 @@ if (!is_robolectric && enable_java_templates) {

‎patches/build-config-locales.gni.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/build/config/locales.gni b/build/config/locales.gni
2-
index e1f23cb53d9d41b28fcdd1562e2a7898433932b6..b5936d50d8a93a5025c3895075e7ec07d0ea15db 100644
2+
index e9396dc224305274b1dfdf1de326712e595134a7..124d93b3c668566b0689ebcc40bb8b30aa9f07d2 100644
33
--- a/build/config/locales.gni
44
+++ b/build/config/locales.gni
5-
@@ -154,6 +154,7 @@ extended_locales = [
5+
@@ -161,6 +161,7 @@ extended_locales = [
66
"zh-HK",
77
"zu",
88
]

‎patches/chrome-BUILD.gn.patch

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
2-
index 97f843f8133c49d684b415f61ef4b4084c4d345c..cb324232abb00bfade2273c7953c9e030f83fd05 100644
2+
index f47270687b9a12fb74be2e90cc1e9f25e2e2d34e..880d904d23320cdfb4e4fbe600e5bc4faeec09eb 100644
33
--- a/chrome/BUILD.gn
44
+++ b/chrome/BUILD.gn
5-
@@ -199,6 +199,7 @@ if (!is_android && !is_mac) {
5+
@@ -196,6 +196,7 @@ if (!is_android && !is_mac) {
66
"common/crash_keys.cc",
77
"common/crash_keys.h",
88
]
99
+ sources -= [ "app/chrome_exe.rc", ] sources += [ "//brave/app/brave_exe.rc", ]
1010

1111
deps += [
1212
":chrome_dll",
13-
@@ -507,11 +508,12 @@ if (is_win) {
13+
@@ -504,11 +505,12 @@ if (is_win) {
1414
args += [ "--keystone=0" ]
1515
}
1616
}
@@ -24,23 +24,23 @@ index 97f843f8133c49d684b415f61ef4b4084c4d345c..cb324232abb00bfade2273c7953c9e03
2424
extra_substitutions = [
2525
"CHROMIUM_BUNDLE_ID=$chrome_mac_bundle_id",
2626
"CHROMIUM_SHORT_NAME=$chrome_product_short_name",
27-
@@ -531,6 +533,7 @@ if (is_win) {
27+
@@ -528,6 +530,7 @@ if (is_win) {
2828
"//chrome/common:buildflags",
2929
"//chrome/common:version_header",
3030
]
3131
+ deps += [ "//brave:brave_app" ]
3232

3333
if (enable_updater) {
3434
deps += [ ":chromium_updater_privileged_helper" ]
35-
@@ -671,6 +674,7 @@ if (is_win) {
35+
@@ -668,6 +671,7 @@ if (is_win) {
3636
# this dependency directly copies the file into the framework's
3737
# resources directory.
3838
public_deps += [ ":chrome_framework_widevine_signature" ]
3939
+ public_deps -= [ ":chrome_framework_widevine_signature" ]
4040
}
4141
}
4242

43-
@@ -714,9 +718,11 @@ if (is_win) {
43+
@@ -711,9 +715,11 @@ if (is_win) {
4444
"--scm=0",
4545
]
4646
}
@@ -52,15 +52,15 @@ index 97f843f8133c49d684b415f61ef4b4084c4d345c..cb324232abb00bfade2273c7953c9e03
5252
if (is_chrome_branded && include_branded_entitlements) {
5353
# These entitlements are bound to the official Google Chrome signing
5454
# certificate and will not necessarily work in any other build.
55-
@@ -741,6 +747,7 @@ if (is_win) {
55+
@@ -738,6 +744,7 @@ if (is_win) {
5656
info_plist_target = invoker.info_plist_target
5757
} else {
5858
info_plist_target = ":chrome_helper_plist"
5959
+ info_plist_target = ":brave_helper_plist"
6060
}
6161

6262
extra_substitutions = [
63-
@@ -921,7 +928,7 @@ if (is_win) {
63+
@@ -918,7 +925,7 @@ if (is_win) {
6464
}
6565

6666
if (enable_updater) {
@@ -69,23 +69,23 @@ index 97f843f8133c49d684b415f61ef4b4084c4d345c..cb324232abb00bfade2273c7953c9e03
6969
sources += [ "//third_party/updater/chrome_mac_universal_prod/cipd/${updater_product_full_name}.app" ]
7070
} else {
7171
sources += [ "$root_out_dir/${updater_product_full_name}.app" ]
72-
@@ -1229,6 +1236,7 @@ if (is_win) {
72+
@@ -1226,6 +1233,7 @@ if (is_win) {
7373
"-current_version",
7474
chrome_dylib_version,
7575
]
7676
+ import("//brave/browser/sources.gni") public_deps += brave_chrome_framework_public_deps bundle_deps += brave_chrome_framework_bundle_deps framework_contents += brave_chrome_framework_contents configs += brave_chrome_framework_configs
7777

7878
if (!is_component_build) {
7979
# Specify a sensible install_name for static builds. The library is
80-
@@ -1410,6 +1418,7 @@ if (is_win) {
80+
@@ -1407,6 +1415,7 @@ if (is_win) {
8181

8282
group("dependencies") {
8383
public_deps = [
8484
+ "//brave:browser_dependencies",
8585
"//build:branding_buildflags",
8686
"//build:chromeos_buildflags",
8787
"//chrome/browser",
88-
@@ -1465,7 +1474,7 @@ group("dependencies") {
88+
@@ -1462,7 +1471,7 @@ group("dependencies") {
8989

9090
if (is_win) {
9191
process_version_rc_template("chrome_exe_version") {
@@ -94,15 +94,15 @@ index 97f843f8133c49d684b415f61ef4b4084c4d345c..cb324232abb00bfade2273c7953c9e03
9494
output = "$target_gen_dir/chrome_exe_version.rc"
9595
}
9696

97-
@@ -1514,6 +1523,7 @@ group("resources") {
97+
@@ -1511,6 +1520,7 @@ group("resources") {
9898
"//chrome/browser:resources",
9999
"//chrome/common:resources",
100100
"//chrome/renderer:resources",
101101
+ "//brave:resources",
102102
]
103103
}
104104

105-
@@ -1567,6 +1577,7 @@ if (!is_android) {
105+
@@ -1564,6 +1574,7 @@ if (!is_android) {
106106
if (enable_resource_allowlist_generation) {
107107
repack_allowlist = _chrome_resource_allowlist
108108
deps = [ ":resource_allowlist" ]

‎patches/chrome-android-BUILD.gn.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
2-
index a157bf1e8cfc737f18a801d8a2e17aee4ac59ce0..e2cfb183107e708409fe521eb829c475a41dbdf6 100644
2+
index 9d076c89b9ac6079e52cbead09a90ea1595b5d58..f50cd9b27a6cefd7f537c25687e285ca544b79cf 100644
33
--- a/chrome/android/BUILD.gn
44
+++ b/chrome/android/BUILD.gn
55
@@ -194,6 +194,7 @@ if (_is_default_toolchain) {
@@ -50,23 +50,23 @@ index a157bf1e8cfc737f18a801d8a2e17aee4ac59ce0..e2cfb183107e708409fe521eb829c475
5050

5151
# Dep needed to ensure override works properly.
5252
deps = [ ":chrome_base_module_resources" ]
53-
@@ -1845,6 +1851,7 @@ if (_is_default_toolchain) {
53+
@@ -1854,6 +1860,7 @@ if (_is_default_toolchain) {
5454
":${_variant}_locale_pak_assets",
5555
":${_variant}_paks",
5656
]
5757
+ deps += [ "//brave:brave_pak_assets" ]
5858
if (_is_monochrome) {
5959
deps += [ "//android_webview:locale_pak_assets" ]
6060
}
61-
@@ -2126,6 +2133,7 @@ if (_is_default_toolchain) {
61+
@@ -2135,6 +2142,7 @@ if (_is_default_toolchain) {
6262
"//third_party/androidx:androidx_annotation_annotation_experimental_java",
6363
"//third_party/androidx:androidx_browser_browser_java",
6464
]
6565
+ sources += brave_java_base_module_sources deps += brave_java_base_module_deps
6666

6767
# More deps for DFMs.
6868
if (dfmify_dev_ui) {
69-
@@ -3230,6 +3238,7 @@ if (_is_default_toolchain) {
69+
@@ -3239,6 +3247,7 @@ if (_is_default_toolchain) {
7070
"java/src/org/chromium/chrome/browser/webapps/WebApkUpdateManager.java",
7171
"java/src/org/chromium/chrome/browser/webapps/WebappRegistry.java",
7272
]

‎patches/chrome-android-chrome_java_sources.gni.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
2-
index b433c83d2f3be193104826dd8f8577af90b9a064..d6f050610416619f79d290e0603a3a42d5d66384 100644
2+
index 739d6306d3c293c133abfa9ff4a492dcec5925a0..fd51f67c2d3c315f204d51c114e836b95350aabd 100644
33
--- a/chrome/android/chrome_java_sources.gni
44
+++ b/chrome/android/chrome_java_sources.gni
5-
@@ -1196,3 +1196,4 @@ if (enable_screen_capture) {
5+
@@ -1202,3 +1202,4 @@ if (enable_screen_capture) {
66
"java/src/org/chromium/chrome/browser/media/MediaCapturePickerItemViewBinder.java",
77
]
88
}

‎patches/chrome-android-chrome_public_apk_tmpl.gni.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/chrome/android/chrome_public_apk_tmpl.gni b/chrome/android/chrome_public_apk_tmpl.gni
2-
index 4bb91169abffe362ef0e6069a40d20efc1c99c99..4b0d01f8296213ef231b751d4852dc4f0886a243 100644
2+
index 2a50e4404550d06e1cd48c1d01eeec8e8b525ab3..bb339ba449ee7cb52a7373936e74c07efefcd4d5 100644
33
--- a/chrome/android/chrome_public_apk_tmpl.gni
44
+++ b/chrome/android/chrome_public_apk_tmpl.gni
55
@@ -321,6 +321,7 @@ template("chrome_common_apk_or_module_tmpl") {

‎patches/chrome-android-features-tab_ui-BUILD.gn.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/chrome/android/features/tab_ui/BUILD.gn b/chrome/android/features/tab_ui/BUILD.gn
2-
index e06b1360b910cc88b63b21519985e4c2a51419c5..1a8d807e79780e89ac192b9ec0b724b11bc96654 100644
2+
index 9ed9df2fc26bf43b7373b89e47ae6e8d45fd86ed..3eeebe4ec4cc79641e9470013e3bab3f37d1c1e0 100644
33
--- a/chrome/android/features/tab_ui/BUILD.gn
44
+++ b/chrome/android/features/tab_ui/BUILD.gn
5-
@@ -127,6 +127,7 @@ android_resources("java_resources") {
5+
@@ -120,6 +120,7 @@ android_resources("java_resources") {
66
"java/res/xml/tab_archive_time_delta_preference.xml",
77
"java/res/xml/tabs_settings.xml",
88
]

‎patches/chrome-android-feed-core-java-src-org-chromium-chrome-browser-feed-FeedSurfaceMediator.java.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceMediator.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceMediator.java
2-
index 1c5b565f035e1004177c6624457337ec4db5739f..8ad02391e7a34d0ba689cb1fbfc1afcfc093a694 100644
2+
index 4c2f7c4f75a2b4801393207469fd315f94e701d9..be1283fd26ec655f88cbb7d11f16e890ab163259 100644
33
--- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceMediator.java
44
+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceMediator.java
5-
@@ -380,7 +380,7 @@ public class FeedSurfaceMediator
5+
@@ -393,7 +393,7 @@ public class FeedSurfaceMediator
66
// Start is showing, update the value of Pref.ENABLE_SNIPPETS_BY_DSE here. The
77
// value should be updated before adding an observer to prevent an extra call of
88
// updateContent().

‎patches/chrome-android-java-AndroidManifest.xml.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
2-
index 54244bbdcb5a7599c6182e6092236f29b4b7a795..06feab4bb82d43237dbcbd170d0dabf8ba313ffd 100644
2+
index 3c6b68b8f58a83741f8132d80530c628f05a8ecf..92d9f9c0a0c8c7e40ae13c93bbb5a849f363da88 100644
33
--- a/chrome/android/java/AndroidManifest.xml
44
+++ b/chrome/android/java/AndroidManifest.xml
55
@@ -28,6 +28,7 @@ by a child template that "extends" this file.
@@ -106,7 +106,7 @@ index 54244bbdcb5a7599c6182e6092236f29b4b7a795..06feab4bb82d43237dbcbd170d0dabf8
106106

107107
<!-- Search Activity -->
108108
<activity android:name="org.chromium.chrome.browser.searchwidget.SearchActivity"
109-
@@ -1217,6 +1235,7 @@ by a child template that "extends" this file.
109+
@@ -1220,6 +1238,7 @@ by a child template that "extends" this file.
110110
</activity>
111111
{% endif %}
112112

‎patches/chrome-android-java-src-org-chromium-chrome-browser-browsing_data-ClearBrowsingDataFragment.java.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragment.java
2-
index 678fd760c01d4cf081ccb641bb119ee53aba6fac..e86c5e23da2b47eeb3d680f7f9c5b44a14b157d4 100644
2+
index fd0b704d5c40b133d72d972ac1e297e9b735c98d..06a595aa951d8d76a92572361164180311391490 100644
33
--- a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragment.java
44
+++ b/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragment.java
5-
@@ -361,7 +361,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
5+
@@ -348,7 +348,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment
66
}
77

88
/** Called when browsing data is about to be cleared. */

‎patches/chrome-android-java-src-org-chromium-chrome-browser-contextmenu-ChromeContextMenuPopulator.java.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ index ccdc0f5fe4c610add51e3314a439a9f5d6c20f4f..84437e44ac4fc6075aeb214b04495f14
1818
+ int COPY_CLEAN_LINK = 49;int NUM_ENTRIES = 50;
1919
}
2020
}
21-
21+
2222
@@ -385,6 +386,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
2323
if (!MailTo.isMailTo(mParams.getLinkUrl().getSpec())
2424
&& !UrlUtilities.isTelScheme(mParams.getLinkUrl())) {

‎patches/chrome-android-java-src-org-chromium-chrome-browser-fullscreen-FullscreenHtmlApiHandlerBase.java.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/FullscreenHtmlApiHandlerBase.java b/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/FullscreenHtmlApiHandlerBase.java
2-
index 545b9ee31756d533eba47e406835b0829b0ae81c..863e6d59a1ff924dcf2e0388d61dff4f5eaff69b 100644
2+
index a326a5b1e637afefe28214e83ac43b0614bacada..6c6329e43acef8b67f3341c47c0b3ca00e6d172c 100644
33
--- a/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/FullscreenHtmlApiHandlerBase.java
44
+++ b/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/FullscreenHtmlApiHandlerBase.java
55
@@ -300,6 +300,7 @@ public abstract class FullscreenHtmlApiHandlerBase

‎patches/chrome-android-java-src-org-chromium-chrome-browser-notifications-NotificationPlatformBridge.java.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationPlatformBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationPlatformBridge.java
2-
index c23907206ff29342e5c0eb561dbe833968563b1f..7036f787ae33a686ef82094fa5eae408aaac5ccf 100644
2+
index 59ffb3cbb7125a4a8c31d3087df9268979664e2c..3f78228244de774ce537cdb9953ed39cde4eb3c9 100644
33
--- a/chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationPlatformBridge.java
44
+++ b/chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationPlatformBridge.java
5-
@@ -152,7 +152,7 @@ public class NotificationPlatformBridge {
5+
@@ -164,7 +164,7 @@ public class NotificationPlatformBridge {
66
"ShowWarningsForSuspiciousNotificationsShouldSwapButtons";
77

88
/** Encapsulates attributes that identify a notification and where it originates from. */
@@ -11,7 +11,7 @@ index c23907206ff29342e5c0eb561dbe833968563b1f..7036f787ae33a686ef82094fa5eae408
1111
public final String notificationId;
1212
public final @NotificationType int notificationType;
1313
public final String origin;
14-
@@ -949,7 +949,7 @@ public class NotificationPlatformBridge {
14+
@@ -1063,7 +1063,7 @@ public class NotificationPlatformBridge {
1515
.storeNotificationResourcesIfSuspended(notification);
1616
}
1717

‎patches/chrome-android-java-src-org-chromium-chrome-browser-privacy-settings-PrivacySettings.java.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
2-
index a2718ae46cf88f63a3c98ccf24246db3ca9b1183..ce2cb99c8d64574697916bf834728429a3bccad0 100644
2+
index 824f5d07191556863aa323d875d36d7b6ac1c21f..9a14f75b47e79eac8ad949fec51a5c9ba79473e7 100644
33
--- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
44
+++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
55
@@ -77,7 +77,7 @@ import java.util.concurrent.TimeUnit;
@@ -11,15 +11,15 @@ index a2718ae46cf88f63a3c98ccf24246db3ca9b1183..ce2cb99c8d64574697916bf834728429
1111
implements Preference.OnPreferenceChangeListener {
1212
private static final String PREF_CAN_MAKE_PAYMENT = "can_make_payment";
1313
private static final String PREF_PRELOAD_PAGES = "preload_pages";
14-
@@ -554,6 +554,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
14+
@@ -550,6 +550,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
1515
@Override
1616
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
1717
menu.clear();
1818
+ super.onCreateOptionsMenu(menu, inflater);
1919
MenuItem help =
2020
menu.add(Menu.NONE, R.id.menu_id_targeted_help, Menu.NONE, R.string.menu_help);
2121
help.setIcon(
22-
@@ -568,7 +569,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
22+
@@ -564,7 +565,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
2323
.show(getActivity(), getString(R.string.help_context_privacy), null);
2424
return true;
2525
}

‎patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-ManageSyncSettings.java.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java
2-
index b0a7be5b3d6cd9d6634caee78841497eaafe77d7..410ff4e5c56bc2579c9b1a870c3c69f48674e8ea 100644
2+
index 882ced01c4502e1066b27004aa6926c7088c741d..3ba2c1052b2559313b2b3d974d16aa3a373fa47f 100644
33
--- a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java
44
+++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java
55
@@ -65,7 +65,7 @@ import org.chromium.chrome.browser.ui.signin.SigninUtils;
@@ -11,7 +11,7 @@ index b0a7be5b3d6cd9d6634caee78841497eaafe77d7..410ff4e5c56bc2579c9b1a870c3c69f4
1111
import org.chromium.components.browser_ui.settings.ChromeBasePreference;
1212
import org.chromium.components.browser_ui.settings.ChromeSwitchPreference;
1313
import org.chromium.components.browser_ui.settings.SettingsUtils;
14-
@@ -665,7 +665,7 @@ public class ManageSyncSettings extends ChromeBaseSettingsFragment
14+
@@ -656,7 +656,7 @@ public class ManageSyncSettings extends ChromeBaseSettingsFragment
1515
? ConsentLevel.SIGNIN
1616
: ConsentLevel.SYNC));
1717
// May happen if account is removed from the device while this screen is shown.

0 commit comments

Comments
 (0)