Skip to content

Commit 5931a17

Browse files
quh4gko8thestinger
authored andcommitted
Update/port patches for 133.0.6943.39.0
1 parent a2cc772 commit 5931a17

File tree

123 files changed

+30751
-28858
lines changed

Some content is hidden

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

123 files changed

+30751
-28858
lines changed

patches/0001-Vanadium-string-rebranding.patch

+30,175-28,390
Large diffs are not rendered by default.

patches/0002-Vanadium-branding.patch

+3-3
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@ Current incantation of the recolor command:
4949
create mode 100644 chrome/android/java/res_vanadium_base/values/channel_constants.xml
5050

5151
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
52-
index fd15a5d6881bf..3d383c5a4661d 100644
52+
index 2b75f7f769629..814267f2ad367 100644
5353
--- a/chrome/android/BUILD.gn
5454
+++ b/chrome/android/BUILD.gn
55-
@@ -174,24 +174,24 @@ if (current_toolchain == default_toolchain) {
55+
@@ -173,24 +173,24 @@ if (current_toolchain == default_toolchain) {
5656
"java/res_base/values/ic_launcher_round_alias.xml",
5757
"java/res_base/values/values.xml",
5858
"java/res_base/xml/network_security_config.xml",
@@ -95,7 +95,7 @@ index fd15a5d6881bf..3d383c5a4661d 100644
9595
]
9696
}
9797

98-
@@ -2298,24 +2298,24 @@ if (current_toolchain == default_toolchain) {
98+
@@ -2313,24 +2313,24 @@ if (current_toolchain == default_toolchain) {
9999
android_resources("chrome_public_apk_base_module_resources") {
100100
resource_overlay = true
101101
sources = [

patches/0004-Support-for-extended-version-name-and-increments.patch

+14-14
Original file line numberDiff line numberDiff line change
@@ -10,40 +10,40 @@ Subject: [PATCH] Support for extended version name and increments
1010
3 files changed, 38 insertions(+), 5 deletions(-)
1111

1212
diff --git a/build/util/android_chrome_version.py b/build/util/android_chrome_version.py
13-
index 957bfa0306e6a..adc9798d31f74 100755
13+
index df72ff54c0eb2..106140bc5caaa 100755
1414
--- a/build/util/android_chrome_version.py
1515
+++ b/build/util/android_chrome_version.py
1616
@@ -317,7 +317,7 @@ def TranslateVersionCode(version_code, is_webview=False):
1717
is_next_build)
1818

1919

20-
-def GenerateVersionCodes(build_number, patch_number, arch, is_next_build):
21-
+def GenerateVersionCodes(build_number, patch_number, increment_number, arch, is_next_build):
20+
-def GenerateVersionCodes(build_number, patch_number, arch):
21+
+def GenerateVersionCodes(build_number, patch_number, increment_number, arch):
2222
"""Build dict of version codes for the specified build architecture. Eg:
2323

2424
{
25-
@@ -340,7 +340,7 @@ def GenerateVersionCodes(build_number, patch_number, arch, is_next_build):
25+
@@ -340,7 +340,7 @@ def GenerateVersionCodes(build_number, patch_number, arch):
2626

2727
Thus, this method is responsible for the final two digits of versionCode.
2828
"""
2929
- base_version_code = (build_number * 1000 + patch_number) * 100
3030
+ base_version_code = (build_number * 1000 + patch_number + increment_number) * 100
3131

32-
if is_next_build:
33-
base_version_code += _NEXT_BUILD_VERSION_CODE_DIFF
34-
@@ -385,8 +385,8 @@ def main():
32+
mfg, bitness = _ARCH_TO_MFG_AND_BITNESS[arch]
33+
34+
@@ -378,8 +378,8 @@ def main():
3535
elif args.version_name:
3636
if not args.arch:
3737
parser.error('Required --arch')
3838
- _, _, build, patch = args.version_name.split('.')
39-
- values = GenerateVersionCodes(int(build), int(patch), args.arch, args.next)
39+
- values = GenerateVersionCodes(int(build), int(patch), args.arch)
4040
+ _, _, build, patch, increment = args.version_name.split('.')
41-
+ values = GenerateVersionCodes(int(build), int(patch), int(increment), args.arch, args.next)
41+
+ values = GenerateVersionCodes(int(build), int(patch), int(increment), args.arch)
4242
for k, v in values.items():
4343
print(f'{k}={v}')
4444
else:
4545
diff --git a/build/util/version.py b/build/util/version.py
46-
index 35518ba862f21..1b5aec667ef54 100755
46+
index c69969b91736c..922a4a2e6ca6c 100755
4747
--- a/build/util/version.py
4848
+++ b/build/util/version.py
4949
@@ -136,6 +136,10 @@ def BuildParser():
@@ -57,21 +57,21 @@ index 35518ba862f21..1b5aec667ef54 100755
5757
parser.add_argument('-x',
5858
'--executable',
5959
default=False,
60-
@@ -213,9 +217,11 @@ def GenerateValues(options, evals):
60+
@@ -209,9 +213,11 @@ def GenerateValues(options, evals):
6161
for key, val in evals.items():
6262
values[key] = str(eval(val, globals(), values))
6363

6464
+ values['INCREMENT'] = options.increment
6565
if options.os == 'android':
6666
android_chrome_version_codes = android_chrome_version.GenerateVersionCodes(
67-
- int(values['BUILD']), int(values['PATCH']), options.arch, options.next)
67+
- int(values['BUILD']), int(values['PATCH']), options.arch)
6868
+ int(values['BUILD']), int(values['PATCH']), int(values['INCREMENT']),
69-
+ options.arch, options.next)
69+
+ options.arch)
7070
values.update(android_chrome_version_codes)
7171

7272
return values
7373
diff --git a/chrome/version.gni b/chrome/version.gni
74-
index df1d7654ed182..892a912557472 100644
74+
index 84ad35c21a292..3292823aee62b 100644
7575
--- a/chrome/version.gni
7676
+++ b/chrome/version.gni
7777
@@ -41,6 +41,33 @@ if (target_os == "android") {

patches/0007-enable-stack-clash-protection-for-arm64-targets.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ Subject: [PATCH] enable stack clash protection for arm64 targets
88
1 file changed, 4 insertions(+)
99

1010
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
11-
index f58320b88f207..8771a5dcdb5dd 100644
11+
index 88109264ea962..2e4e5205b5de0 100644
1212
--- a/build/config/compiler/BUILD.gn
1313
+++ b/build/config/compiler/BUILD.gn
14-
@@ -377,6 +377,10 @@ config("compiler") {
14+
@@ -387,6 +387,10 @@ config("compiler") {
1515
}
1616
}
1717

patches/0008-switch-to-fstack-protector-strong.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ Subject: [PATCH] switch to -fstack-protector-strong
88
1 file changed, 1 insertion(+), 1 deletion(-)
99

1010
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
11-
index 8771a5dcdb5dd..3029bbb1101df 100644
11+
index 2e4e5205b5de0..b42626fde7d8f 100644
1212
--- a/build/config/compiler/BUILD.gn
1313
+++ b/build/config/compiler/BUILD.gn
14-
@@ -372,7 +372,7 @@ config("compiler") {
14+
@@ -382,7 +382,7 @@ config("compiler") {
1515
} else if ((is_posix && !is_nacl) || is_fuchsia) {
1616
if (current_os != "aix") {
1717
# Not available on aix.

patches/0009-enable-fwrapv-in-Clang-for-non-UBSan-builds.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ Subject: [PATCH] enable -fwrapv in Clang for non-UBSan builds
88
1 file changed, 4 insertions(+)
99

1010
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
11-
index 3029bbb1101df..345faddef7534 100644
11+
index b42626fde7d8f..608098e9feb3b 100644
1212
--- a/build/config/compiler/BUILD.gn
1313
+++ b/build/config/compiler/BUILD.gn
14-
@@ -388,6 +388,10 @@ config("compiler") {
14+
@@ -398,6 +398,10 @@ config("compiler") {
1515
}
1616
}
1717

patches/0010-enable-ftrivial-auto-var-init-zero.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ Subject: [PATCH] enable -ftrivial-auto-var-init=zero
88
1 file changed, 4 insertions(+)
99

1010
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
11-
index 345faddef7534..e5e3ec4b201a3 100644
11+
index 608098e9feb3b..41cd325f53dd8 100644
1212
--- a/build/config/compiler/BUILD.gn
1313
+++ b/build/config/compiler/BUILD.gn
14-
@@ -392,6 +392,10 @@ config("compiler") {
14+
@@ -402,6 +402,10 @@ config("compiler") {
1515
cflags += [ "-fwrapv" ]
1616
}
1717

patches/0011-disable-broken-warning-for-auto-var-init.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ Subject: [PATCH] disable broken warning for auto var init
88
1 file changed, 1 insertion(+), 1 deletion(-)
99

1010
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
11-
index e5e3ec4b201a3..271d766420a99 100644
11+
index 41cd325f53dd8..2ee2f038c6f77 100644
1212
--- a/build/config/compiler/BUILD.gn
1313
+++ b/build/config/compiler/BUILD.gn
14-
@@ -393,7 +393,7 @@ config("compiler") {
14+
@@ -403,7 +403,7 @@ config("compiler") {
1515
}
1616

1717
if (is_clang) {

patches/0012-Checkout-PGO-profiles.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ Subject: [PATCH] Checkout PGO profiles
88
1 file changed, 1 insertion(+), 1 deletion(-)
99

1010
diff --git a/DEPS b/DEPS
11-
index 5060c1c4273c4..a26544f8a0c40 100644
11+
index 1684d3520eaa8..aa1a8524da295 100644
1212
--- a/DEPS
1313
+++ b/DEPS
14-
@@ -145,7 +145,7 @@ vars = {
14+
@@ -149,7 +149,7 @@ vars = {
1515
'checkout_clang_coverage_tools': False,
1616

1717
# Fetch the pgo profiles to optimize official builds.

patches/0013-disable-checkout_nacl.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Subject: [PATCH] disable checkout_nacl
88
1 file changed, 1 insertion(+), 1 deletion(-)
99

1010
diff --git a/DEPS b/DEPS
11-
index a26544f8a0c40..6037ac0f1addf 100644
11+
index aa1a8524da295..eba7a4cc39ae2 100644
1212
--- a/DEPS
1313
+++ b/DEPS
1414
@@ -114,7 +114,7 @@ vars = {

patches/0015-disable-seed-based-field-trials.patch

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ Subject: [PATCH] disable seed-based field trials
99
2 files changed, 12 insertions(+)
1010

1111
diff --git a/components/variations/service/variations_field_trial_creator_base.cc b/components/variations/service/variations_field_trial_creator_base.cc
12-
index 73ff906e1b51a..d4324986fd65f 100644
12+
index 753fc845cc205..d8fbd413acabc 100644
1313
--- a/components/variations/service/variations_field_trial_creator_base.cc
1414
+++ b/components/variations/service/variations_field_trial_creator_base.cc
15-
@@ -263,8 +263,14 @@ bool VariationsFieldTrialCreatorBase::SetUpFieldTrials(
15+
@@ -260,8 +260,14 @@ bool VariationsFieldTrialCreatorBase::SetUpFieldTrials(
1616
}
1717
// Force the variation ids selected in chrome://flags and/or specified using
1818
// the command-line flag.
@@ -27,7 +27,7 @@ index 73ff906e1b51a..d4324986fd65f 100644
2727

2828
switch (result) {
2929
case VariationsIdsProvider::ForceIdsResult::INVALID_SWITCH_ENTRY:
30-
@@ -322,13 +328,17 @@ bool VariationsFieldTrialCreatorBase::SetUpFieldTrials(
30+
@@ -318,13 +324,17 @@ bool VariationsFieldTrialCreatorBase::SetUpFieldTrials(
3131

3232
bool used_seed = false;
3333
if (!used_testing_config) {

patches/0016-disable-fetching-variations.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Subject: [PATCH] disable fetching variations
88
1 file changed, 1 insertion(+), 1 deletion(-)
99

1010
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/AsyncInitTaskRunner.java b/chrome/android/java/src/org/chromium/chrome/browser/init/AsyncInitTaskRunner.java
11-
index 14b47a9d148f5..4601ee31cf50b 100644
11+
index e4f52fd24f65a..62545c0a6804f 100644
1212
--- a/chrome/android/java/src/org/chromium/chrome/browser/init/AsyncInitTaskRunner.java
1313
+++ b/chrome/android/java/src/org/chromium/chrome/browser/init/AsyncInitTaskRunner.java
1414
@@ -39,7 +39,7 @@ public abstract class AsyncInitTaskRunner {

patches/0017-disable-WebView-variations-support.patch

+5-5
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ Subject: [PATCH] disable WebView variations support
99
2 files changed, 10 deletions(-)
1010

1111
diff --git a/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumAwInit.java b/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumAwInit.java
12-
index 41d018cdfecf2..bdd270f9f97ac 100644
12+
index 223b2f84dc0f6..445757c31077a 100644
1313
--- a/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumAwInit.java
1414
+++ b/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumAwInit.java
15-
@@ -249,12 +249,6 @@ public class WebViewChromiumAwInit {
15+
@@ -343,12 +343,6 @@ public class WebViewChromiumAwInit {
1616

1717
AwBrowserProcess.configureChildProcessLauncher();
1818

@@ -26,10 +26,10 @@ index 41d018cdfecf2..bdd270f9f97ac 100644
2626

2727
// TODO(crbug.com/332706093): See if this can be moved before loading native.
2828
diff --git a/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java b/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
29-
index 63c5f5a5b2795..f961388d11e67 100644
29+
index 813d087fe7f43..2250510486f0f 100644
3030
--- a/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
3131
+++ b/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
32-
@@ -522,10 +522,6 @@ public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider {
32+
@@ -554,10 +554,6 @@ public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider {
3333
}
3434
}
3535

@@ -39,4 +39,4 @@ index 63c5f5a5b2795..f961388d11e67 100644
3939
-
4040
mShouldDisableThreadChecking = shouldDisableThreadChecking(ctx);
4141

42-
setSingleton(this);
42+
FlagOverrideHelper helper =

patches/0018-disable-Media-Integrity-blink-extension-API-on-webvi.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ Subject: [PATCH] disable Media Integrity blink extension API on webview by
99
1 file changed, 1 insertion(+), 1 deletion(-)
1010

1111
diff --git a/android_webview/common/aw_features.cc b/android_webview/common/aw_features.cc
12-
index c3aca7ff67069..a90d3294e0775 100644
12+
index 25597a0e5aa3a..439a305ac439a 100644
1313
--- a/android_webview/common/aw_features.cc
1414
+++ b/android_webview/common/aw_features.cc
15-
@@ -70,7 +70,7 @@ BASE_FEATURE(kWebViewLazyFetchHandWritingIcon,
15+
@@ -71,7 +71,7 @@ BASE_FEATURE(kWebViewLazyFetchHandWritingIcon,
1616
// This feature requires `kWebViewMediaIntegrityApi` to be disabled.
1717
BASE_FEATURE(kWebViewMediaIntegrityApiBlinkExtension,
1818
"WebViewMediaIntegrityApiBlinkExtension",

patches/0019-disable-navigation-error-correction-by-default.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ Subject: [PATCH] disable navigation error correction by default
88
1 file changed, 1 insertion(+), 1 deletion(-)
99

1010
diff --git a/chrome/browser/net/profile_network_context_service.cc b/chrome/browser/net/profile_network_context_service.cc
11-
index 3956f9fea2546..47e5679388e37 100644
11+
index c29bbe4620212..ab19ae156407b 100644
1212
--- a/chrome/browser/net/profile_network_context_service.cc
1313
+++ b/chrome/browser/net/profile_network_context_service.cc
14-
@@ -501,7 +501,7 @@ void ProfileNetworkContextService::ConfigureNetworkContextParams(
14+
@@ -511,7 +511,7 @@ void ProfileNetworkContextService::ConfigureNetworkContextParams(
1515
void ProfileNetworkContextService::RegisterProfilePrefs(
1616
user_prefs::PrefRegistrySyncable* registry) {
1717
registry->RegisterBooleanPref(embedder_support::kAlternateErrorPagesEnabled,

patches/0020-disable-contextual-search-by-default.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ index 46146a968f9df..3eea0b291ed27 100644
2222

2323
/**
2424
diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc
25-
index 4385d5d90f9c8..e1345ab756877 100644
25+
index a490fefce8c79..caef72e40532d 100644
2626
--- a/chrome/browser/profiles/profile.cc
2727
+++ b/chrome/browser/profiles/profile.cc
28-
@@ -321,7 +321,7 @@ void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
28+
@@ -323,7 +323,7 @@ void Profile::RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
2929
#if BUILDFLAG(IS_ANDROID)
3030
registry->RegisterStringPref(
3131
prefs::kContextualSearchEnabled,

patches/0022-disable-metrics-by-default.patch

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ Subject: [PATCH] disable metrics by default
88
1 file changed, 1 insertion(+), 1 deletion(-)
99

1010
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivityBase.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivityBase.java
11-
index 5fab25ee3b2ba..efacb87fdc538 100644
11+
index 0822c2cc0c74b..8389495a3a8bd 100644
1212
--- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivityBase.java
1313
+++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivityBase.java
14-
@@ -64,7 +64,7 @@ public abstract class FirstRunActivityBase extends AsyncInitializationActivity
15-
static final String SHOW_SYNC_CONSENT_PAGE = "ShowSyncConsent";
14+
@@ -45,7 +45,7 @@ public abstract class FirstRunActivityBase extends FullscreenSigninAndHistorySyn
15+
static final String SHOW_SEARCH_ENGINE_PAGE = "ShowSearchEnginePage";
1616
static final String SHOW_HISTORY_SYNC_PAGE = "ShowHistorySync";
1717

1818
- public static final boolean DEFAULT_METRICS_AND_CRASH_REPORTING = true;
1919
+ public static final boolean DEFAULT_METRICS_AND_CRASH_REPORTING = false;
2020

21-
private static PolicyLoadListenerFactory sPolicyLoadListenerFactoryForTesting;
21+
private boolean mNativeInitialized;
2222

patches/0023-disable-hyperlink-auditing-by-default.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ Subject: [PATCH] disable hyperlink auditing by default
88
1 file changed, 1 insertion(+), 1 deletion(-)
99

1010
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
11-
index 25b5c325f612d..71117258f70f8 100644
11+
index a1a8e77a2ef3f..01a90b8b97c6b 100644
1212
--- a/chrome/browser/chrome_content_browser_client.cc
1313
+++ b/chrome/browser/chrome_content_browser_client.cc
14-
@@ -1580,7 +1580,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs(
14+
@@ -1557,7 +1557,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs(
1515
void ChromeContentBrowserClient::RegisterProfilePrefs(
1616
user_prefs::PrefRegistrySyncable* registry) {
1717
registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false);

patches/0026-disable-content-feed-suggestions-by-default.patch

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ Subject: [PATCH] disable content feed suggestions by default
88
1 file changed, 1 insertion(+), 1 deletion(-)
99

1010
diff --git a/components/feed/feed_feature_list.cc b/components/feed/feed_feature_list.cc
11-
index 6e15d1a1fd751..0019b41180af5 100644
11+
index 1eb7a97d785fa..713f489300a14 100644
1212
--- a/components/feed/feed_feature_list.cc
1313
+++ b/components/feed/feed_feature_list.cc
14-
@@ -27,7 +27,7 @@ const char kEnableRssLinkReader[] = "enable-rss-link-reader";
14+
@@ -22,7 +22,7 @@ namespace feed {
1515
// changed, please update the cached one's default value in CachedFeatureFlags.
1616
BASE_FEATURE(kInterestFeedV2,
1717
"InterestFeedV2",
1818
- base::FEATURE_ENABLED_BY_DEFAULT);
1919
+ base::FEATURE_DISABLED_BY_DEFAULT);
2020

21-
BASE_FEATURE(kInterestFeedV2Hearts,
22-
"InterestFeedV2Hearts",
21+
BASE_FEATURE(kDiscoFeedEndpoint,
22+
"DiscoFeedEndpoint",

patches/0027-disable-sensors-access-by-default.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ Subject: [PATCH] disable sensors access by default
88
1 file changed, 1 insertion(+), 1 deletion(-)
99

1010
diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc
11-
index 06431fe9ee873..4d70229b0712e 100644
11+
index 217c1e811de81..65301c0621352 100644
1212
--- a/components/content_settings/core/browser/content_settings_registry.cc
1313
+++ b/components/content_settings/core/browser/content_settings_registry.cc
14-
@@ -374,7 +374,7 @@ void ContentSettingsRegistry::Init() {
14+
@@ -383,7 +383,7 @@ void ContentSettingsRegistry::Init() {
1515
// TODO(crbug.com/40602007): Update this to "SECURE_ONLY" once
1616
// DeviceOrientationEvents and DeviceMotionEvents are only fired in secure
1717
// contexts.

patches/0028-block-playing-protected-media-by-default.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Subject: [PATCH] block playing protected media by default
88
1 file changed, 1 insertion(+), 1 deletion(-)
99

1010
diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc
11-
index 4d70229b0712e..003d66572f811 100644
11+
index 65301c0621352..4c6690bcce3ab 100644
1212
--- a/components/content_settings/core/browser/content_settings_registry.cc
1313
+++ b/components/content_settings/core/browser/content_settings_registry.cc
1414
@@ -211,7 +211,7 @@ void ContentSettingsRegistry::Init() {

patches/0029-disable-third-party-cookies-by-default.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Subject: [PATCH] disable third party cookies by default
88
1 file changed, 1 insertion(+), 1 deletion(-)
99

1010
diff --git a/components/content_settings/core/browser/cookie_settings.cc b/components/content_settings/core/browser/cookie_settings.cc
11-
index e78605d5e0782..68bdbc8856731 100644
11+
index 2916d802872a5..445109ad3142f 100644
1212
--- a/components/content_settings/core/browser/cookie_settings.cc
1313
+++ b/components/content_settings/core/browser/cookie_settings.cc
1414
@@ -94,7 +94,7 @@ void CookieSettings::RegisterProfilePrefs(

patches/0030-disable-background-sync-by-default.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Subject: [PATCH] disable background sync by default
88
1 file changed, 1 insertion(+), 1 deletion(-)
99

1010
diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc
11-
index 003d66572f811..4f35fdd0b0162 100644
11+
index 4c6690bcce3ab..5e6bdb6c3e13a 100644
1212
--- a/components/content_settings/core/browser/content_settings_registry.cc
1313
+++ b/components/content_settings/core/browser/content_settings_registry.cc
1414
@@ -238,7 +238,7 @@ void ContentSettingsRegistry::Init() {

patches/0032-disable-media-router-media-remoting-by-default.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ Subject: [PATCH] disable media router media remoting by default
88
1 file changed, 1 insertion(+), 1 deletion(-)
99

1010
diff --git a/chrome/browser/media/router/media_router_feature.cc b/chrome/browser/media/router/media_router_feature.cc
11-
index 3deb85ae0d542..ab523a7a94b4a 100644
11+
index 7a5f1c892b9cf..22437807a9112 100644
1212
--- a/chrome/browser/media/router/media_router_feature.cc
1313
+++ b/chrome/browser/media/router/media_router_feature.cc
14-
@@ -160,7 +160,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
14+
@@ -157,7 +157,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
1515
registry->RegisterStringPref(prefs::kMediaRouterReceiverIdHashToken, "",
1616
PrefRegistry::PUBLIC);
1717
registry->RegisterBooleanPref(

0 commit comments

Comments
 (0)