<resetlink>reset sync<resetlink>reset sync
diff --git a/build/patches/Add-exit-menu-item.patch b/build/patches/Add-exit-menu-item.patch
index b8ca87ac..22460521 100644
--- a/build/patches/Add-exit-menu-item.patch
+++ b/build/patches/Add-exit-menu-item.patch
@@ -53,7 +53,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeLife
diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
--- a/chrome/android/java/strings/android_chrome_strings.grd
+++ b/chrome/android/java/strings/android_chrome_strings.grd
-@@ -3081,6 +3081,9 @@ To change this setting, <resetlink>reset sync
<resetlink>reset sync
Settings
diff --git a/build/patches/Add-menu-option-to-toggle-global-Javascript-preference.patch b/build/patches/Add-menu-option-to-toggle-global-Javascript-preference.patch
index ea522efa..cbd0bcba 100644
--- a/build/patches/Add-menu-option-to-toggle-global-Javascript-preference.patch
+++ b/build/patches/Add-menu-option-to-toggle-global-Javascript-preference.patch
@@ -184,7 +184,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
--- a/chrome/android/java/strings/android_chrome_strings.grd
+++ b/chrome/android/java/strings/android_chrome_strings.grd
-@@ -3066,6 +3066,17 @@ To change this setting, <resetlink>reset sync
<resetlink>reset sync
Find in page
diff --git a/build/patches/Add-option-to-not-persist-tabs-across-sessions.patch b/build/patches/Add-option-to-not-persist-tabs-across-sessions.patch
index 0cb14edb..87b05fec 100644
--- a/build/patches/Add-option-to-not-persist-tabs-across-sessions.patch
+++ b/build/patches/Add-option-to-not-persist-tabs-across-sessions.patch
@@ -72,7 +72,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
import org.chromium.base.BuildInfo;
import org.chromium.base.metrics.RecordHistogram;
import org.chromium.chrome.R;
-@@ -44,6 +46,7 @@ public class PrivacyPreferences extends PreferenceFragment
+@@ -43,6 +45,7 @@ public class PrivacyPreferences extends PreferenceFragment
private static final String PREF_CAN_MAKE_PAYMENT = "can_make_payment";
private static final String PREF_CONTEXTUAL_SEARCH = "contextual_search";
private static final String PREF_NETWORK_PREDICTIONS = "network_predictions";
@@ -80,7 +80,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
private static final String PREF_DO_NOT_TRACK = "do_not_track";
private static final String PREF_USAGE_AND_CRASH_REPORTING = "usage_and_crash_reports";
private static final String PREF_CLEAR_BROWSING_DATA = "clear_browsing_data";
-@@ -71,6 +74,11 @@ public class PrivacyPreferences extends PreferenceFragment
+@@ -67,6 +70,11 @@ public class PrivacyPreferences extends PreferenceFragment
(ChromeBaseCheckBoxPreference) findPreference(PREF_CAN_MAKE_PAYMENT);
canMakePaymentPref.setOnPreferenceChangeListener(this);
@@ -92,7 +92,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
ChromeBaseCheckBoxPreference networkPredictionPref =
(ChromeBaseCheckBoxPreference) findPreference(PREF_NETWORK_PREDICTIONS);
networkPredictionPref.setChecked(prefServiceBridge.getNetworkPredictionEnabled());
-@@ -143,6 +151,12 @@ public class PrivacyPreferences extends PreferenceFragment
+@@ -126,6 +134,12 @@ public class PrivacyPreferences extends PreferenceFragment
} else if (PREF_NETWORK_PREDICTIONS.equals(key)) {
PrefServiceBridge.getInstance().setNetworkPredictionEnabled((boolean) newValue);
recordNetworkPredictionEnablingUMA((boolean) newValue);
@@ -108,7 +108,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
--- a/chrome/android/java/strings/android_chrome_strings.grd
+++ b/chrome/android/java/strings/android_chrome_strings.grd
-@@ -3880,6 +3880,12 @@ To change this setting, <resetlink>reset sync
<resetlink>reset sync
IMAGE
diff --git a/build/patches/Add-option-to-use-home-page-as-NTP.patch b/build/patches/Add-option-to-use-home-page-as-NTP.patch
index 8fbd57db..82c4d79e 100644
--- a/build/patches/Add-option-to-use-home-page-as-NTP.patch
+++ b/build/patches/Add-option-to-use-home-page-as-NTP.patch
@@ -157,7 +157,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabCre
diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
--- a/chrome/android/java/strings/android_chrome_strings.grd
+++ b/chrome/android/java/strings/android_chrome_strings.grd
-@@ -674,6 +674,9 @@ CHAR-LIMIT guidelines:
+@@ -668,6 +668,9 @@ CHAR-LIMIT guidelines:
Open this page
diff --git a/build/patches/Add-site-settings-option-for-session-only-cookies.patch b/build/patches/Add-site-settings-option-for-session-only-cookies.patch
index 1c3ea860..c8edcf8b 100644
--- a/build/patches/Add-site-settings-option-for-session-only-cookies.patch
+++ b/build/patches/Add-site-settings-option-for-session-only-cookies.patch
@@ -163,7 +163,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/web
diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
--- a/chrome/android/java/strings/android_chrome_strings.grd
+++ b/chrome/android/java/strings/android_chrome_strings.grd
-@@ -913,6 +913,12 @@ Your Google account may have other forms of browsing history like searches and a
+@@ -907,6 +907,12 @@ Your Google account may have other forms of browsing history like searches and a
Prevent third-party websites from saving and reading cookie data
diff --git a/build/patches/Allow-building-without-safebrowsing-for-Android.patch b/build/patches/Allow-building-without-safebrowsing-for-Android.patch
index 7fccbfdb..7565f015 100644
--- a/build/patches/Allow-building-without-safebrowsing-for-Android.patch
+++ b/build/patches/Allow-building-without-safebrowsing-for-Android.patch
@@ -45,7 +45,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java
-@@ -40,9 +40,6 @@ public class PrivacyPreferences extends PreferenceFragment
+@@ -39,9 +39,6 @@ public class PrivacyPreferences extends PreferenceFragment
implements OnPreferenceChangeListener {
private static final String PREF_NAVIGATION_ERROR = "navigation_error";
private static final String PREF_SEARCH_SUGGESTIONS = "search_suggestions";
@@ -55,7 +55,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
private static final String PREF_CAN_MAKE_PAYMENT = "can_make_payment";
private static final String PREF_CONTEXTUAL_SEARCH = "contextual_search";
private static final String PREF_NETWORK_PREDICTIONS = "network_predictions";
-@@ -83,8 +80,6 @@ public class PrivacyPreferences extends PreferenceFragment
+@@ -79,8 +76,6 @@ public class PrivacyPreferences extends PreferenceFragment
// Remove preferences that were migrated to SyncAndServicesPreferences.
preferenceScreen.removePreference(findPreference(PREF_NAVIGATION_ERROR));
preferenceScreen.removePreference(findPreference(PREF_SEARCH_SUGGESTIONS));
@@ -64,7 +64,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
preferenceScreen.removePreference(findPreference(PREF_CONTEXTUAL_SEARCH));
preferenceScreen.removePreference(findPreference(PREF_USAGE_AND_CRASH_REPORTING));
-@@ -131,17 +126,6 @@ public class PrivacyPreferences extends PreferenceFragment
+@@ -114,17 +109,6 @@ public class PrivacyPreferences extends PreferenceFragment
preferenceScreen.removePreference(findPreference(PREF_CONTEXTUAL_SEARCH));
}
@@ -82,7 +82,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
updateSummaries();
}
-@@ -150,11 +134,6 @@ public class PrivacyPreferences extends PreferenceFragment
+@@ -133,11 +117,6 @@ public class PrivacyPreferences extends PreferenceFragment
String key = preference.getKey();
if (PREF_SEARCH_SUGGESTIONS.equals(key)) {
PrefServiceBridge.getInstance().setSearchSuggestEnabled((boolean) newValue);
@@ -94,7 +94,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
} else if (PREF_NETWORK_PREDICTIONS.equals(key)) {
PrefServiceBridge.getInstance().setNetworkPredictionEnabled((boolean) newValue);
recordNetworkPredictionEnablingUMA((boolean) newValue);
-@@ -206,19 +185,6 @@ public class PrivacyPreferences extends PreferenceFragment
+@@ -189,19 +168,6 @@ public class PrivacyPreferences extends PreferenceFragment
searchSuggestionsPref.setChecked(prefServiceBridge.isSearchSuggestEnabled());
}
@@ -114,7 +114,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
CheckBoxPreference canMakePaymentPref =
(CheckBoxPreference) findPreference(PREF_CAN_MAKE_PAYMENT);
if (canMakePaymentPref != null) {
-@@ -267,12 +233,6 @@ public class PrivacyPreferences extends PreferenceFragment
+@@ -250,12 +216,6 @@ public class PrivacyPreferences extends PreferenceFragment
if (PREF_SEARCH_SUGGESTIONS.equals(key)) {
return prefs.isSearchSuggestManaged();
}
@@ -158,7 +158,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
#include "chrome/browser/safe_browsing/safe_browsing_service.h"
#include "chrome/browser/safe_browsing/ui_manager.h"
#include "chrome/browser/safe_browsing/url_checker_delegate_impl.h"
-@@ -4248,11 +4247,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
+@@ -4249,11 +4248,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
PreviewsLitePageDecider::MaybeCreateThrottleFor(handle);
if (previews_lite_page_throttle)
throttles.push_back(std::move(previews_lite_page_throttle));
@@ -170,7 +170,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
#if defined(OS_WIN) || defined(OS_MACOSX) || \
(defined(OS_LINUX) && !defined(OS_CHROMEOS))
-@@ -5192,19 +5186,7 @@ ChromeContentBrowserClient::GetSafeBrowsingUrlCheckerDelegate(
+@@ -5199,19 +5193,7 @@ ChromeContentBrowserClient::GetSafeBrowsingUrlCheckerDelegate(
content::ResourceContext* resource_context) {
DCHECK_CURRENTLY_ON(BrowserThread::IO);
diff --git a/build/patches/Bromite-adblock-engine.patch b/build/patches/Bromite-adblock-engine.patch
index 2fb9f4e8..80dd503d 100644
--- a/build/patches/Bromite-adblock-engine.patch
+++ b/build/patches/Bromite-adblock-engine.patch
@@ -280,7 +280,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
--- a/chrome/android/java/strings/android_chrome_strings.grd
+++ b/chrome/android/java/strings/android_chrome_strings.grd
-@@ -3086,6 +3086,17 @@ To change this setting, <resetlink>reset sync
<resetlink>reset sync
Turn on Request desktop site
diff --git a/build/patches/Disable-signin-and-data-saver-preferences.patch b/build/patches/Disable-signin-and-data-saver-preferences.patch
index 5200df62..1bdc3f12 100644
--- a/build/patches/Disable-signin-and-data-saver-preferences.patch
+++ b/build/patches/Disable-signin-and-data-saver-preferences.patch
@@ -4,25 +4,39 @@ Subject: Disable signin and data saver preferences
Never show the data saver promo snackbar
---
- chrome/android/java/res/xml/main_preferences.xml | 9 ---
- .../browser/preferences/MainPreferences.java | 91 +---------------------
- 2 files changed, 2 insertions(+), 98 deletions(-)
+ chrome/android/java/res/xml/main_preferences.xml | 20 -----
+ .../android/java/res/xml/privacy_preferences.xml | 7 --
+ .../browser/preferences/MainPreferences.java | 92 +---------------------
+ .../preferences/privacy/PrivacyPreferences.java | 17 ----
+ .../java/strings/android_chrome_strings.grd | 6 --
+ 5 files changed, 1 insertion(+), 141 deletions(-)
diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/java/res/xml/main_preferences.xml
--- a/chrome/android/java/res/xml/main_preferences.xml
+++ b/chrome/android/java/res/xml/main_preferences.xml
-@@ -10,10 +10,6 @@
- android:key="account_section"
- android:order="0"
- android:title="@string/prefs_section_account"/>
+@@ -7,21 +7,6 @@
+ android:orderingFromXml="false">
+
+
-
-
+-
+-
+@@ -96,11 +81,6 @@
android:key="languages"
android:order="17"
android:title="@string/prefs_languages"/>
@@ -34,6 +48,21 @@ diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/j
+-
+-
+
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java
@@ -54,20 +83,20 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Mai
import org.chromium.chrome.browser.util.FeatureUtilities;
import java.util.HashMap;
-@@ -36,11 +32,8 @@ import java.util.Map;
+@@ -36,11 +32,7 @@ import java.util.Map;
* The main settings screen, shown when the user first opens Settings.
*/
public class MainPreferences extends PreferenceFragment
- implements TemplateUrlService.LoadListener, ProfileSyncService.SyncStateChangedListener,
- SigninManager.SignInStateObserver {
-+ implements TemplateUrlService.LoadListener {
- public static final String PREF_ACCOUNT_SECTION = "account_section";
+- public static final String PREF_ACCOUNT_SECTION = "account_section";
- public static final String PREF_SIGN_IN = "sign_in";
- public static final String PREF_SYNC_AND_SERVICES = "sync_and_services";
++ implements TemplateUrlService.LoadListener {
public static final String PREF_SEARCH_ENGINE = "search_engine";
public static final String PREF_SAVED_PASSWORDS = "saved_passwords";
public static final String PREF_CONTEXTUAL_SUGGESTIONS = "contextual_suggestions";
-@@ -60,7 +53,6 @@ public class MainPreferences extends PreferenceFragment
+@@ -60,7 +52,6 @@ public class MainPreferences extends PreferenceFragment
private final ManagedPreferenceDelegate mManagedPreferenceDelegate;
private final Map mAllPreferences = new HashMap<>();
@@ -75,7 +104,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Mai
public MainPreferences() {
setHasOptionsMenu(true);
-@@ -76,33 +68,16 @@ public class MainPreferences extends PreferenceFragment
+@@ -76,33 +67,16 @@ public class MainPreferences extends PreferenceFragment
@Override
public void onDestroy() {
super.onDestroy();
@@ -109,7 +138,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Mai
}
@Override
-@@ -115,17 +90,11 @@ public class MainPreferences extends PreferenceFragment
+@@ -115,17 +89,9 @@ public class MainPreferences extends PreferenceFragment
PreferenceUtils.addPreferencesFromResource(this, R.xml.main_preferences);
cachePreferences();
@@ -119,8 +148,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Mai
- getPreferenceScreen().removePreference(findPreference(PREF_ACCOUNT_SECTION));
- getPreferenceScreen().removePreference(findPreference(PREF_SYNC_AND_SERVICES));
- }
-+ getPreferenceScreen().removePreference(findPreference(PREF_ACCOUNT_SECTION));
-
+-
updatePasswordsPreference();
setManagedPreferenceDelegateForPreference(PREF_SEARCH_ENGINE);
@@ -128,7 +156,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Mai
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
// If we are on Android O+ the Notifications preference should lead to the Android
-@@ -189,7 +158,6 @@ public class MainPreferences extends PreferenceFragment
+@@ -189,7 +155,6 @@ public class MainPreferences extends PreferenceFragment
Preference preference = getPreferenceScreen().getPreference(index);
mAllPreferences.put(preference.getKey(), preference);
}
@@ -136,7 +164,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Mai
}
private void setManagedPreferenceDelegateForPreference(String key) {
-@@ -198,13 +166,6 @@ public class MainPreferences extends PreferenceFragment
+@@ -198,13 +163,6 @@ public class MainPreferences extends PreferenceFragment
}
private void updatePreferences() {
@@ -150,7 +178,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Mai
updateSearchEnginePreference();
Preference homepagePref = addPreferenceIfAbsent(PREF_HOMEPAGE);
-@@ -234,10 +195,6 @@ public class MainPreferences extends PreferenceFragment
+@@ -234,10 +192,6 @@ public class MainPreferences extends PreferenceFragment
} else {
removePreferenceIfPresent(PREF_DEVELOPER);
}
@@ -161,7 +189,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Mai
}
private Preference addPreferenceIfAbsent(String key) {
-@@ -251,15 +208,6 @@ public class MainPreferences extends PreferenceFragment
+@@ -251,15 +205,6 @@ public class MainPreferences extends PreferenceFragment
if (preference != null) getPreferenceScreen().removePreference(preference);
}
@@ -177,7 +205,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Mai
private void updateSearchEnginePreference() {
if (!TemplateUrlService.getInstance().isLoaded()) {
ChromeBasePreference searchEnginePref =
-@@ -291,28 +239,6 @@ public class MainPreferences extends PreferenceFragment
+@@ -291,28 +236,6 @@ public class MainPreferences extends PreferenceFragment
pref.setSummary(getResources().getString(isOn ? R.string.text_on : R.string.text_off));
}
@@ -206,7 +234,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Mai
// TemplateUrlService.LoadListener implementation.
@Override
public void onTemplateUrlServiceLoaded() {
-@@ -320,11 +246,6 @@ public class MainPreferences extends PreferenceFragment
+@@ -320,11 +243,6 @@ public class MainPreferences extends PreferenceFragment
updateSearchEnginePreference();
}
@@ -218,7 +246,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Mai
@VisibleForTesting
ManagedPreferenceDelegate getManagedPreferenceDelegateForTest() {
return mManagedPreferenceDelegate;
-@@ -334,9 +255,6 @@ public class MainPreferences extends PreferenceFragment
+@@ -334,9 +252,6 @@ public class MainPreferences extends PreferenceFragment
return new ManagedPreferenceDelegate() {
@Override
public boolean isPreferenceControlledByPolicy(Preference preference) {
@@ -228,7 +256,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Mai
if (PREF_SEARCH_ENGINE.equals(preference.getKey())) {
return TemplateUrlService.getInstance().isDefaultSearchManaged();
}
-@@ -345,11 +263,6 @@ public class MainPreferences extends PreferenceFragment
+@@ -345,11 +260,6 @@ public class MainPreferences extends PreferenceFragment
@Override
public boolean isPreferenceClickDisabledByPolicy(Preference preference) {
@@ -240,6 +268,73 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/Mai
if (PREF_SEARCH_ENGINE.equals(preference.getKey())) {
return TemplateUrlService.getInstance().isDefaultSearchManaged();
}
+diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java
+--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java
++++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/privacy/PrivacyPreferences.java
+@@ -27,7 +27,6 @@ import org.chromium.chrome.browser.preferences.Pref;
+ import org.chromium.chrome.browser.preferences.PrefServiceBridge;
+ import org.chromium.chrome.browser.preferences.PreferenceUtils;
+ import org.chromium.chrome.browser.preferences.PreferencesLauncher;
+-import org.chromium.chrome.browser.preferences.SyncAndServicesPreferences;
+ import org.chromium.chrome.browser.profiles.Profile;
+ import org.chromium.chrome.browser.usage_stats.UsageStatsConsentDialog;
+ import org.chromium.ui.text.NoUnderlineClickableSpan;
+@@ -49,9 +48,6 @@ public class PrivacyPreferences extends PreferenceFragment
+ private static final String PREF_DO_NOT_TRACK = "do_not_track";
+ private static final String PREF_USAGE_AND_CRASH_REPORTING = "usage_and_crash_reports";
+ private static final String PREF_CLEAR_BROWSING_DATA = "clear_browsing_data";
+- private static final String PREF_SYNC_AND_SERVICES_LINK_DIVIDER =
+- "sync_and_services_link_divider";
+- private static final String PREF_SYNC_AND_SERVICES_LINK = "sync_and_services_link";
+ private static final String PREF_USAGE_STATS = "usage_stats_reporting";
+
+ private ManagedPreferenceDelegate mManagedPreferenceDelegate;
+@@ -100,22 +96,9 @@ public class PrivacyPreferences extends PreferenceFragment
+ networkPredictionPref.setOrder(canMakePaymentPref.getOrder());
+ preferenceScreen.addPreference(networkPredictionPref);
+
+- Preference syncAndServicesLink = findPreference(PREF_SYNC_AND_SERVICES_LINK);
+- NoUnderlineClickableSpan linkSpan =
+- new NoUnderlineClickableSpan(getResources(), view -> {
+- PreferencesLauncher.launchSettingsPage(getActivity(),
+- SyncAndServicesPreferences.class,
+- SyncAndServicesPreferences.createArguments(false));
+- });
+- syncAndServicesLink.setSummary(
+- SpanApplier.applySpans(getString(R.string.privacy_sync_and_services_link),
+- new SpanApplier.SpanInfo("", "", linkSpan)));
+-
+ updateSummaries();
+ return;
+ }
+- preferenceScreen.removePreference(findPreference(PREF_SYNC_AND_SERVICES_LINK_DIVIDER));
+- preferenceScreen.removePreference(findPreference(PREF_SYNC_AND_SERVICES_LINK));
+
+ ChromeBaseCheckBoxPreference navigationErrorPref =
+ (ChromeBaseCheckBoxPreference) findPreference(PREF_NAVIGATION_ERROR);
+diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
+--- a/chrome/android/java/strings/android_chrome_strings.grd
++++ b/chrome/android/java/strings/android_chrome_strings.grd
+@@ -315,9 +315,6 @@ CHAR-LIMIT guidelines:
+
+
+
+-
+- Account
+-
+
+ Sign in to Chrome
+
+@@ -400,9 +397,6 @@ CHAR-LIMIT guidelines:
+
+ Sends URLs of pages you visit to Google
+
+-
+- For more settings that relate to privacy, security, and data collection, see <link>Sync and Google services</link>
+-
+
+ Help improve Chrome's features and performance
+
--
2.11.0
diff --git a/build/patches/Disable-sync-adaptive-service-from-manifest.patch b/build/patches/Disable-sync-adaptive-service-from-manifest.patch
index 4923b233..6d486efc 100644
--- a/build/patches/Disable-sync-adaptive-service-from-manifest.patch
+++ b/build/patches/Disable-sync-adaptive-service-from-manifest.patch
@@ -3,15 +3,25 @@ Date: Sun, 14 Apr 2019 12:08:27 +0200
Subject: Disable sync adaptive service from manifest
Prevents authorization prompt for Play services on reboot
+
+Remove sync invalidation service
+
+Fixes building with debug symbols:
+
+ld.lld: error: undefined symbol: notifier::NotifierOptions::NotifierOptions()
+>>> referenced by invalidation_service_util.cc:17 (../../components/invalidation/impl/invalidation_service_util.cc:17)
+>>> impl/invalidation_service_util.o:(invalidation::ParseNotifierOptions(base::CommandLine const&)) in archive obj/components/invalidation/impl/libimpl.a
---
- chrome/android/BUILD.gn | 4 +---
- chrome/android/java/AndroidManifest.xml | 21 ---------------------
- 2 files changed, 1 insertion(+), 24 deletions(-)
+ chrome/android/BUILD.gn | 4 +---
+ chrome/android/java/AndroidManifest.xml | 19 -------------------
+ .../invalidation/impl/invalidation_service_util.cc | 21 ---------------------
+ .../invalidation/impl/invalidation_service_util.h | 6 +-----
+ 4 files changed, 2 insertions(+), 48 deletions(-)
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
-@@ -1022,8 +1022,7 @@ jinja_template_resources("chrome_public_apk_template_resources") {
+@@ -1023,8 +1023,7 @@ jinja_template_resources("chrome_public_apk_template_resources") {
resources = [
"java/res_template/xml/file_paths.xml",
"java/res_template/xml/launchershortcuts.xml",
@@ -21,7 +31,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
]
res_dir = "java/res_template"
variables = [ "manifest_package=$manifest_package" ]
-@@ -1034,7 +1033,6 @@ jinja_template_resources("chrome_test_apk_template_resources") {
+@@ -1035,7 +1034,6 @@ jinja_template_resources("chrome_test_apk_template_resources") {
"java/res_template/xml/file_paths.xml",
"java/res_template/xml/launchershortcuts.xml",
"java/res_template/xml/searchable.xml",
@@ -32,7 +42,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
--- a/chrome/android/java/AndroidManifest.xml
+++ b/chrome/android/java/AndroidManifest.xml
-@@ -919,16 +919,6 @@ by a child template that "extends" this file.
+@@ -925,16 +925,6 @@ by a child template that "extends" this file.
android:resource="@xml/file_paths" />
@@ -49,9 +59,9 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro
-@@ -997,17 +987,6 @@ by a child template that "extends" this file.
- android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize"
- android:hardwareAccelerated="false" />
+@@ -1040,15 +1030,6 @@ by a child template that "extends" this file.
+
-
-
-
-
--
-
-
+
+ namespace base {
+ class CommandLine;
+@@ -13,10 +13,6 @@ class CommandLine;
+
+ namespace invalidation {
+
+-// Parses the given command line for notifier options.
+-notifier::NotifierOptions ParseNotifierOptions(
+- const base::CommandLine& command_line);
+-
+ // Generates a unique client ID for the invalidator.
+ std::string GenerateInvalidatorClientId();
+
--
2.11.0
diff --git a/build/patches/Do-not-grant-notifications-to-default-search-engine.patch b/build/patches/Do-not-grant-notifications-to-default-search-engine.patch
index 3764376a..0f7081cf 100644
--- a/build/patches/Do-not-grant-notifications-to-default-search-engine.patch
+++ b/build/patches/Do-not-grant-notifications-to-default-search-engine.patch
@@ -54,7 +54,7 @@ diff --git a/chrome/browser/android/search_permissions/search_permissions_servic
diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
--- a/chrome/common/chrome_features.cc
+++ b/chrome/common/chrome_features.cc
-@@ -322,7 +322,7 @@ const base::Feature kGoogleBrandedContextMenu{
+@@ -329,7 +329,7 @@ const base::Feature kGoogleBrandedContextMenu{
#if defined(OS_ANDROID)
const base::Feature kGrantNotificationsToDSE{"GrantNotificationsToDSE",
diff --git a/build/patches/Enable-site-per-process-isolation-for-devices-with-enough-memory.patch b/build/patches/Enable-site-per-process-isolation-for-devices-with-enough-memory.patch
index 0ce52ca1..3ac72864 100644
--- a/build/patches/Enable-site-per-process-isolation-for-devices-with-enough-memory.patch
+++ b/build/patches/Enable-site-per-process-isolation-for-devices-with-enough-memory.patch
@@ -9,7 +9,7 @@ Subject: Enable site per process isolation for devices with enough memory
diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
--- a/chrome/common/chrome_features.cc
+++ b/chrome/common/chrome_features.cc
-@@ -552,11 +552,7 @@ const base::Feature kShowTrustedPublisherURL{"ShowTrustedPublisherURL",
+@@ -559,11 +559,7 @@ const base::Feature kShowTrustedPublisherURL{"ShowTrustedPublisherURL",
// browser_features, as they are only used on the browser side.
const base::Feature kSitePerProcess {
"site-per-process",
@@ -21,7 +21,7 @@ diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
};
// Controls a mode for dynamically process-isolating sites where the user has
-@@ -578,7 +574,7 @@ const base::Feature kSiteIsolationForPasswordSites{
+@@ -585,7 +581,7 @@ const base::Feature kSiteIsolationForPasswordSites{
// base::SysInfo::AmountOfPhysicalMemoryMB().
const base::Feature kSitePerProcessOnlyForHighMemoryClients{
"site-per-process-only-for-high-memory-clients",
diff --git a/build/patches/Modify-default-preferences.patch b/build/patches/Modify-default-preferences.patch
index c7866ac1..fd0194c9 100644
--- a/build/patches/Modify-default-preferences.patch
+++ b/build/patches/Modify-default-preferences.patch
@@ -36,7 +36,7 @@ diff --git a/chrome/browser/background/background_mode_manager.cc b/chrome/brows
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
-@@ -1121,7 +1121,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs(
+@@ -1122,7 +1122,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs(
void ChromeContentBrowserClient::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false);
diff --git a/build/patches/Remove-Sync-and-Translate-menu.patch b/build/patches/Remove-background-sync-and-translate-menu-options.patch
similarity index 99%
rename from build/patches/Remove-Sync-and-Translate-menu.patch
rename to build/patches/Remove-background-sync-and-translate-menu-options.patch
index b7b1c502..71f65bc0 100644
--- a/build/patches/Remove-Sync-and-Translate-menu.patch
+++ b/build/patches/Remove-background-sync-and-translate-menu-options.patch
@@ -1,6 +1,6 @@
From: Serg
Date: Wed, 22 Mar 2017 19:10:30 -0400
-Subject: Remove Sync and Translate menu
+Subject: Remove background sync and translate menu options
---
.../java/res/drawable-hdpi/settings_translate.png | Bin 399 -> 0 bytes
diff --git a/build/patches/Rollback-android-minSdkVersion-from-19-KitKat-to-16-JellyBean.patch b/build/patches/Rollback-android-minSdkVersion-from-19-KitKat-to-16-JellyBean.patch
index 1df29fdb..d8983fc5 100644
--- a/build/patches/Rollback-android-minSdkVersion-from-19-KitKat-to-16-JellyBean.patch
+++ b/build/patches/Rollback-android-minSdkVersion-from-19-KitKat-to-16-JellyBean.patch
@@ -103,7 +103,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
"target_sdk_version=$android_sdk_version",
]
-@@ -1556,7 +1556,7 @@ template("chrome_public_apk_or_module_tmpl") {
+@@ -1554,7 +1554,7 @@ template("chrome_public_apk_or_module_tmpl") {
android_manifest = chrome_modern_public_android_manifest
android_manifest_dep = ":chrome_modern_public_android_manifest"
} else {
@@ -112,7 +112,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
android_manifest = chrome_public_android_manifest
android_manifest_dep = ":chrome_public_android_manifest"
}
-@@ -1779,7 +1779,7 @@ jinja_template("chrome_public_test_apk_manifest") {
+@@ -1777,7 +1777,7 @@ jinja_template("chrome_public_test_apk_manifest") {
variables = default_chrome_public_jinja_variables
variables += [
"manifest_package=$test_manifest_package",
@@ -121,7 +121,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
"target_sdk_version=$android_sdk_version",
]
}
-@@ -1790,7 +1790,7 @@ jinja_template("chrome_public_test_vr_apk_manifest") {
+@@ -1788,7 +1788,7 @@ jinja_template("chrome_public_test_vr_apk_manifest") {
output = chrome_public_test_vr_apk_manifest
variables = chrome_public_jinja_variables
variables += [
diff --git a/build/patches/kill-GCM.patch b/build/patches/kill-GCM.patch
index b7d5e5c8..684d7de0 100644
--- a/build/patches/kill-GCM.patch
+++ b/build/patches/kill-GCM.patch
@@ -74,7 +74,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro
-@@ -1002,43 +997,6 @@ by a child template that "extends" this file.
+@@ -992,47 +987,8 @@ by a child template that "extends" this file.
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize"
android:hardwareAccelerated="false" />
@@ -115,11 +115,6 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro
-
-
-
-
-@@ -1050,8 +1008,6 @@ by a child template that "extends" this file.
-
-
diff --git a/build/patches/ungoogled-chromium-Disable-safe-browsing.patch b/build/patches/ungoogled-chromium-Disable-safe-browsing.patch
index 3e36bd80..17f692b5 100644
--- a/build/patches/ungoogled-chromium-Disable-safe-browsing.patch
+++ b/build/patches/ungoogled-chromium-Disable-safe-browsing.patch
@@ -215,7 +215,7 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
-@@ -860,30 +860,6 @@ void SetApplicationLocaleOnIOThread(const std::string& locale) {
+@@ -861,30 +861,6 @@ void SetApplicationLocaleOnIOThread(const std::string& locale) {
GetIOThreadApplicationLocale() = locale;
}
@@ -246,7 +246,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
#if defined(OS_ANDROID)
float GetDeviceScaleAdjustment() {
static const float kMinFSM = 1.05f;
-@@ -2089,7 +2065,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
+@@ -2090,7 +2066,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
// Disable client-side phishing detection in the renderer if it is
// disabled in the Profile preferences or the browser process.
if (!prefs->GetBoolean(prefs::kSafeBrowsingEnabled) ||
@@ -255,7 +255,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
command_line->AppendSwitch(
switches::kDisableClientSidePhishingDetection);
}
-@@ -2718,7 +2694,7 @@ void ChromeContentBrowserClient::AllowCertificateError(
+@@ -2719,7 +2695,7 @@ void ChromeContentBrowserClient::AllowCertificateError(
SSLErrorHandler::HandleSSLError(
web_contents, cert_error, ssl_info, request_url,
expired_previous_decision,
@@ -264,7 +264,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
callback, SSLErrorHandler::BlockingPageReadyCallback());
}
-@@ -3003,8 +2979,6 @@ bool ChromeContentBrowserClient::CanCreateWindow(
+@@ -3004,8 +2980,6 @@ bool ChromeContentBrowserClient::CanCreateWindow(
void ChromeContentBrowserClient::ResourceDispatcherHostCreated() {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
@@ -273,7 +273,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
for (size_t i = 0; i < extra_parts_.size(); ++i)
extra_parts_[i]->ResourceDispatcherHostCreated();
-@@ -4242,7 +4216,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
+@@ -4243,7 +4217,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
if (base::FeatureList::IsEnabled(features::kSSLCommittedInterstitials)) {
throttles.push_back(std::make_unique(
handle,
diff --git a/build/patches_list.txt b/build/patches_list.txt
index 0d29f825..ee84c8bc 100644
--- a/build/patches_list.txt
+++ b/build/patches_list.txt
@@ -21,7 +21,8 @@ Disable-data-saver.patch
Skip-the-first-run-and-metrics.patch
Disable-signin-and-data-saver-preferences.patch
Disable-signin-data-reduction-promos.patch
-Remove-Sync-and-Translate-menu.patch
+Remove-background-sync-and-translate-menu-options.patch
+Disable-sync-adaptive-service-from-manifest.patch
Never-send-any-crash-upload-data.patch
Hide-send-reports-checkbox.patch
Never-fetch-popular-sites.patch
@@ -111,4 +112,3 @@ Enable-site-per-process-isolation-for-devices-with-enough-memory.patch
Use-64-bit-WebView-processes.patch
Add-option-to-use-home-page-as-NTP.patch
Enable-night-mode-menu-entry-by-default.patch
-Disable-sync-adaptive-service-from-manifest.patch