Skip to content

Commit

Permalink
Update/port to 118.0.5993.48
Browse files Browse the repository at this point in the history
  • Loading branch information
vanadium-staging authored and thestinger committed Oct 4, 2023
1 parent 57f0109 commit 7949c43
Show file tree
Hide file tree
Showing 74 changed files with 29,993 additions and 22,233 deletions.
4 changes: 2 additions & 2 deletions args.gn
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ target_os = "android"
target_cpu = "arm64"

android_channel = "stable"
android_default_version_name = "117.0.5938.153"
android_default_version_code = "593815300"
android_default_version_name = "118.0.5993.48"
android_default_version_code = "599304800"

ext_version_enabled = true
ext_version_increment = "0"
Expand Down
4 changes: 2 additions & 2 deletions patches/0001-disable-checkout_nacl.patch
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ Subject: [PATCH] disable checkout_nacl
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DEPS b/DEPS
index 66155efb39879..3c4c31d6a0c41 100644
index c9558a3dcb540..ed0937db17b66 100644
--- a/DEPS
+++ b/DEPS
@@ -119,7 +119,7 @@ vars = {
@@ -123,7 +123,7 @@ vars = {

# Check out and download nacl by default, unless on an arm mac.
# This can be disabled e.g. with custom_vars.
Expand Down
4 changes: 2 additions & 2 deletions patches/0003-switch-to-fstack-protector-strong.patch
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ Subject: [PATCH] switch to -fstack-protector-strong
1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
index 46a1fcea63c6f..fb9c1e178b9da 100644
index 06812fb9c2188..c3abb3009a563 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -360,18 +360,12 @@ config("compiler") {
@@ -368,18 +368,12 @@ config("compiler") {
cflags += [ "-fstack-protector" ]
}
} else if ((is_posix && !is_chromeos && !is_nacl) || is_fuchsia) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ Subject: [PATCH] enable -fwrapv in Clang for non-UBSan builds
1 file changed, 4 insertions(+)

diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
index fb9c1e178b9da..fc4905b3f4ee0 100644
index c3abb3009a563..bb23226f8580d 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -377,6 +377,10 @@ config("compiler") {
@@ -385,6 +385,10 @@ config("compiler") {
}
}

Expand Down
4 changes: 2 additions & 2 deletions patches/0005-enable-ftrivial-auto-var-init-zero.patch
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ Subject: [PATCH] enable -ftrivial-auto-var-init=zero
1 file changed, 4 insertions(+)

diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
index fc4905b3f4ee0..0a124ccc2459d 100644
index bb23226f8580d..55ef720b88846 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -381,6 +381,10 @@ config("compiler") {
@@ -389,6 +389,10 @@ config("compiler") {
cflags += [ "-fwrapv" ]
}

Expand Down
4 changes: 2 additions & 2 deletions patches/0006-disable-broken-warning-for-auto-var-init.patch
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ Subject: [PATCH] disable broken warning for auto var init
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
index 0a124ccc2459d..91cd84f40340e 100644
index 55ef720b88846..1dd265d278c61 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -382,7 +382,7 @@ config("compiler") {
@@ -390,7 +390,7 @@ config("compiler") {
}

if (is_clang) {
Expand Down
4 changes: 2 additions & 2 deletions patches/0007-Vanadium-branding.patch
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ Current incantation of the recolor command:
create mode 100644 chrome/android/java/res_vanadium_base/values/channel_constants.xml

diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
index d7ceb4f02120e..07b517135ffdd 100644
index e89e2f7d23cdf..71024b8249305 100644
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -150,24 +150,24 @@ if (current_toolchain == default_toolchain) {
Expand Down Expand Up @@ -95,7 +95,7 @@ index d7ceb4f02120e..07b517135ffdd 100644
]
}

@@ -2080,24 +2080,24 @@ if (current_toolchain == default_toolchain) {
@@ -2102,24 +2102,24 @@ if (current_toolchain == default_toolchain) {
android_resources("chrome_public_apk_base_module_resources") {
resource_overlay = true
sources = [
Expand Down
51,475 changes: 29,597 additions & 21,878 deletions patches/0009-Vanadium-string-rebranding.patch

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion patches/0010-Remove-logo-from-chrome-version.patch
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Subject: [PATCH] Remove logo from chrome://version
1 file changed, 7 deletions(-)

diff --git a/components/version_ui/resources/about_version.html b/components/version_ui/resources/about_version.html
index d00bc990102ae..19f51bfb26ac5 100644
index 5d04b4b360e33..50ac5af87fbb4 100644
--- a/components/version_ui/resources/about_version.html
+++ b/components/version_ui/resources/about_version.html
@@ -55,13 +55,6 @@ about:version template page
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ Subject: [PATCH] remove Google prefix from storage settings label
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
index 7cd6233a89cf6..6a1e731e999cf 100644
index 838f16105c369..b8949c44aef20 100644
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
@@ -4456,7 +4456,7 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
@@ -4551,7 +4551,7 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p

<!-- Storage Preference UI strings for clearing storage. -->
<message name="IDS_STORAGE_MANAGEMENT_ACTIVITY_LABEL" desc="Title for Vanadium's Manage Space Activity.">
Expand Down
6 changes: 3 additions & 3 deletions patches/0013-remove-Help-feedback-menu-entry.patch
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ Subject: [PATCH] remove Help & feedback menu entry
1 file changed, 2 insertions(+)

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java
index 26e56eb82b03f..3375dbf3f1492 100644
index 952917ff00d68..8df511293642e 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java
@@ -554,6 +554,8 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
@@ -552,6 +552,8 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
menu.findItem(R.id.reader_mode_prefs_id)
.setVisible(isCurrentTabNotNull && shouldShowReaderModePrefs(currentTab));

+ menu.findItem(R.id.help_id).setVisible(false);
+
updateManagedByMenuItem(menu, currentTab);
}

// Only display quick delete divider line on the page menu and if quick delete is enabled.
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,18 @@ Subject: [PATCH] hide passwords.google.com link when not supported
1 file changed, 4 insertions(+)

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java
index 3aa06f182f6b1..7456aa2ed98f2 100644
index b6d1a25a6ab6c..b3193ef3a3990 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java
@@ -40,6 +40,7 @@ import org.chromium.chrome.browser.password_manager.PasswordCheckReferrer;
import org.chromium.chrome.browser.password_manager.PasswordManagerHelper;
import org.chromium.chrome.browser.preferences.Pref;
import org.chromium.chrome.browser.profiles.Profile;
+import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
@@ -44,6 +44,7 @@ import org.chromium.chrome.browser.profiles.Profile;
import org.chromium.chrome.browser.settings.ChromeManagedPreferenceDelegate;
import org.chromium.chrome.browser.settings.ProfileDependentSetting;
import org.chromium.chrome.browser.settings.SettingsLauncherImpl;
@@ -624,6 +625,9 @@ public class PasswordSettings extends PreferenceFragmentCompat
+import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
import org.chromium.chrome.browser.sync.SyncServiceFactory;
import org.chromium.chrome.browser.sync.settings.SyncSettingsUtils;
import org.chromium.components.browser_ui.bottomsheet.BottomSheetController;
@@ -631,6 +632,9 @@ public class PasswordSettings extends PreferenceFragmentCompat
if (mSearchQuery != null && !mNoPasswords) {
return; // Don't add the Manage Account link if there is a search going on.
}
Expand Down
8 changes: 4 additions & 4 deletions patches/0015-disable-first-run-welcome-page.patch
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ Subject: [PATCH] disable first run welcome page
2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunUtils.java
index 411d7e311e004..0c029e117beb7 100644
index 4b20c1479a6b2..a69c381c7a24b 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunUtils.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunUtils.java
@@ -45,15 +45,12 @@ public class FirstRunUtils {
@@ -44,15 +44,12 @@ public class FirstRunUtils {
boolean javaPrefValue =
javaPrefs.readBoolean(ChromePreferenceKeys.FIRST_RUN_CACHED_TOS_ACCEPTED, false);
boolean nativePrefValue = isFirstRunEulaAccepted();
Expand All @@ -29,10 +29,10 @@ index 411d7e311e004..0c029e117beb7 100644

/**
diff --git a/chrome/browser/first_run/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunStatus.java b/chrome/browser/first_run/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunStatus.java
index 46536c7cdd988..59d5c8d322e1f 100644
index 12c311490bd72..cea4d48c0b68c 100644
--- a/chrome/browser/first_run/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunStatus.java
+++ b/chrome/browser/first_run/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunStatus.java
@@ -43,8 +43,12 @@ public class FirstRunStatus {
@@ -52,8 +52,12 @@ public class FirstRunStatus {
* includes ToS and Sign In pages if necessary.
*/
public static boolean getFirstRunFlowComplete() {
Expand Down
4 changes: 2 additions & 2 deletions patches/0017-disable-fetching-variations.patch
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ Subject: [PATCH] disable fetching variations
1 file changed, 1 insertion(+), 1 deletion(-)

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
index 28675ebecf26b..577ab8e775467 100644
index 94602ddf3aab4..c74d2c7f4c036 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/init/AsyncInitTaskRunner.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/init/AsyncInitTaskRunner.java
@@ -39,7 +39,7 @@ public abstract class AsyncInitTaskRunner {
@@ -38,7 +38,7 @@ public abstract class AsyncInitTaskRunner {

@VisibleForTesting
boolean shouldFetchVariationsSeedDuringFirstRun() {
Expand Down
6 changes: 3 additions & 3 deletions patches/0018-disable-WebView-variations-support.patch
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ Subject: [PATCH] disable WebView variations support
2 files changed, 10 deletions(-)

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
index 44b175b7b571a..8896dc9c90719 100644
index 4ad96ad497a8d..238f017a213c2 100644
--- a/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumAwInit.java
+++ b/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumAwInit.java
@@ -199,12 +199,6 @@ public class WebViewChromiumAwInit {
@@ -201,12 +201,6 @@ public class WebViewChromiumAwInit {

AwBrowserProcess.configureChildProcessLauncher();

Expand All @@ -26,7 +26,7 @@ index 44b175b7b571a..8896dc9c90719 100644
AwBrowserProcess.handleMinidumpsAndSetMetricsConsent(true /* updateMetricsConsent */);

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
index 01e7ad25bc45f..be8a25b8c0c60 100644
index 3dd72a9fdeb86..96380c4c20140 100644
--- a/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
+++ b/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
@@ -488,10 +488,6 @@ public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ Subject: [PATCH] disable navigation error correction by default
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chrome/browser/net/profile_network_context_service.cc b/chrome/browser/net/profile_network_context_service.cc
index e45e4487be0a3..c7270f7c34269 100644
index fd92bb9a1f148..38824c029865a 100644
--- a/chrome/browser/net/profile_network_context_service.cc
+++ b/chrome/browser/net/profile_network_context_service.cc
@@ -413,7 +413,7 @@ void ProfileNetworkContextService::UpdateAdditionalCertificates() {
@@ -432,7 +432,7 @@ void ProfileNetworkContextService::UpdateAdditionalCertificates() {
void ProfileNetworkContextService::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(
Expand Down
4 changes: 2 additions & 2 deletions patches/0023-disable-hyperlink-auditing-by-default.patch
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ Subject: [PATCH] disable hyperlink auditing by default
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index da2cf79ceae39..cc9cac35fcfed 100644
index 6f989cff781d7..bd27ed80642f2 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -1599,7 +1599,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs(
@@ -1608,7 +1608,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs(
void ChromeContentBrowserClient::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false);
Expand Down
12 changes: 6 additions & 6 deletions patches/0026-disable-content-feed-suggestions-by-default.patch
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,20 @@ Subject: [PATCH] disable content feed suggestions by default
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
index 723da0089d718..89f4ae73c4816 100644
index 962a3f80cead2..42d01feba0bdd 100644
--- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
+++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
@@ -558,7 +558,7 @@ public abstract class ChromeFeatureList {
@@ -568,7 +568,7 @@ public abstract class ChromeFeatureList {
new CachedFlag(INCOGNITO_REAUTHENTICATION_FOR_ANDROID, false);
public static final CachedFlag sInstanceSwitcher = new CachedFlag(INSTANCE_SWITCHER, true);
public static final CachedFlag sInstantStart = new CachedFlag(INSTANT_START, false);
- public static final CachedFlag sInterestFeedV2 = new CachedFlag(INTEREST_FEED_V2, true);
+ public static final CachedFlag sInterestFeedV2 = new CachedFlag(INTEREST_FEED_V2, false);
public static final CachedFlag sPrivacyGuidePostMVP =
new CachedFlag(PRIVACY_GUIDE_POST_MVP, false);
public static final CachedFlag sOmniboxMatchToolbarAndStatusBarColor =
public static final CachedFlag sNewTabSearchEngineUrlAndroid =
new CachedFlag(NEW_TAB_SEARCH_ENGINE_URL_ANDROID, false);
public static final CachedFlag sPrivacyGuideAndroid3 =
diff --git a/components/feed/feed_feature_list.cc b/components/feed/feed_feature_list.cc
index b1bda3fc9a693..5900d9d5e4aae 100644
index fd4eaa23ab215..14de68240c883 100644
--- a/components/feed/feed_feature_list.cc
+++ b/components/feed/feed_feature_list.cc
@@ -24,7 +24,7 @@ BASE_FEATURE(kInterestFeedContentSuggestions,
Expand Down
4 changes: 2 additions & 2 deletions patches/0027-disable-sensors-access-by-default.patch
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ Subject: [PATCH] disable sensors access by default
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc
index fe872eb3a92a2..6e51cf8d4e871 100644
index 0486610875890..890a178c0a573 100644
--- a/components/content_settings/core/browser/content_settings_registry.cc
+++ b/components/content_settings/core/browser/content_settings_registry.cc
@@ -336,7 +336,7 @@ void ContentSettingsRegistry::Init() {
@@ -346,7 +346,7 @@ void ContentSettingsRegistry::Init() {
// TODO(crbug.com/904439): Update this to "SECURE_ONLY" once
// DeviceOrientationEvents and DeviceMotionEvents are only fired in secure
// contexts.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Subject: [PATCH] block playing protected media by default
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc
index 6e51cf8d4e871..d1a1fbd924524 100644
index 890a178c0a573..73cbf4848c2d0 100644
--- a/components/content_settings/core/browser/content_settings_registry.cc
+++ b/components/content_settings/core/browser/content_settings_registry.cc
@@ -209,7 +209,7 @@ void ContentSettingsRegistry::Init() {
Expand Down
4 changes: 2 additions & 2 deletions patches/0029-disable-third-party-cookies-by-default.patch
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ Subject: [PATCH] disable third party cookies by default
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/content_settings/core/browser/cookie_settings.cc b/components/content_settings/core/browser/cookie_settings.cc
index 442fc281b6cbf..bcf98c3382f8a 100644
index 3adbd6441eaf8..588c6b296dc4c 100644
--- a/components/content_settings/core/browser/cookie_settings.cc
+++ b/components/content_settings/core/browser/cookie_settings.cc
@@ -72,7 +72,7 @@ void CookieSettings::RegisterProfilePrefs(
@@ -68,7 +68,7 @@ void CookieSettings::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterIntegerPref(
prefs::kCookieControlsMode,
Expand Down
2 changes: 1 addition & 1 deletion patches/0030-disable-background-sync-by-default.patch
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Subject: [PATCH] disable background sync by default
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc
index d1a1fbd924524..8730a4e709bc7 100644
index 73cbf4848c2d0..f8d17b160da4e 100644
--- a/components/content_settings/core/browser/content_settings_registry.cc
+++ b/components/content_settings/core/browser/content_settings_registry.cc
@@ -236,7 +236,7 @@ void ContentSettingsRegistry::Init() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ Subject: [PATCH] disable media router media remoting by default
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chrome/browser/media/router/media_router_feature.cc b/chrome/browser/media/router/media_router_feature.cc
index b0c08749791e6..61e17c0599dec 100644
index 5dc6b9392856d..f78dde88e8e7e 100644
--- a/chrome/browser/media/router/media_router_feature.cc
+++ b/chrome/browser/media/router/media_router_feature.cc
@@ -147,7 +147,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
@@ -157,7 +157,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
registry->RegisterStringPref(prefs::kMediaRouterReceiverIdHashToken, "",
PrefRegistry::PUBLIC);
registry->RegisterBooleanPref(
Expand Down
4 changes: 2 additions & 2 deletions patches/0033-disable-media-router-by-default.patch
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ Subject: [PATCH] disable media router by default
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/chrome/browser/media/router/media_router_feature.cc b/chrome/browser/media/router/media_router_feature.cc
index 61e17c0599dec..c00fe0029e5c4 100644
index f78dde88e8e7e..bd1cbb95aefff 100644
--- a/chrome/browser/media/router/media_router_feature.cc
+++ b/chrome/browser/media/router/media_router_feature.cc
@@ -134,7 +134,7 @@ bool MediaRouterEnabled(content::BrowserContext* context) {
@@ -144,7 +144,7 @@ bool MediaRouterEnabled(content::BrowserContext* context) {
pref_values.insert(std::make_pair(context, allowed));
return allowed;
}
Expand Down
4 changes: 2 additions & 2 deletions patches/0034-disable-offering-translations-by-default.patch
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ Subject: [PATCH] disable offering translations by default
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_ui_prefs.cc
index 28732e323ec2e..3ff4c51a93223 100644
index 1d312986c62de..78235f4161394 100644
--- a/chrome/browser/ui/browser_ui_prefs.cc
+++ b/chrome/browser/ui/browser_ui_prefs.cc
@@ -77,7 +77,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
@@ -82,7 +82,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(prefs::kWebAppCreateInAppsMenu, true);
registry->RegisterBooleanPref(prefs::kWebAppCreateInQuickLaunchBar, true);
registry->RegisterBooleanPref(
Expand Down
Loading

0 comments on commit 7949c43

Please sign in to comment.