updated patch with wiggle

Block-all-connection-requests-with-qjz9zk-in-the-domain-name-or-with-a-trk-scheme.patch

Hardening-against-incognito-mode-detection.patch

Remove-weblayer-dependency-on-Play-Services.patch

Timezone-customization.patch

Move-some-account-settings-back-to-privacy-settings.patch

Flag-for-always-desktop-mode.patch

Restore-Simplified-NTP-launch.patch

diff --git a/chrome/android/java/res/values/values.xml b/chrome/android/java/res/values/values.xml

--- a/chrome/android/java/res/values/values.xml

+++ b/chrome/android/java/res/values/values.xml

@@ -38,6 +38,8 @@

@@ -32,6 +32,8 @@

     <integer name="reload_button_level_reload">0</integer>

     <integer name="reload_button_level_stop">1</integer>

Subject: Disable sync services menu entry

---

 .../android/java/res/xml/main_preferences.xml  | 11 ++---------

 .../java/res/xml/privacy_preferences.xml       |  5 -----

 .../sync/settings/SyncSettingsUtils.java       | 18 ------------------

 3 files changed, 2 insertions(+), 32 deletions(-)

 chrome/android/java/res/xml/main_preferences.xml    | 11 ++---------

 chrome/android/java/res/xml/privacy_preferences.xml |  5 -----

 2 files changed, 2 insertions(+), 14 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

-        app:allowDividerBelow="false"

-        android:order="7"/>

 </PreferenceScreen>

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SyncSettingsUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SyncSettingsUtils.java

--- a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SyncSettingsUtils.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SyncSettingsUtils.java

@@ -255,24 +255,6 @@ public class SyncSettingsUtils {

             return res.getString(R.string.sync_data_types_off);

         }

-        boolean syncEnabled = AndroidSyncSettings.get().isSyncEnabled();

-        if (syncEnabled) {

-            if (!profileSyncService.isSyncActive()) {

-                return res.getString(R.string.sync_setup_progress);

-            }

-

-            if (profileSyncService.isPassphraseRequiredForPreferredDataTypes()) {

-                return res.getString(R.string.sync_need_passphrase);

-            }

-

-            if (profileSyncService.isTrustedVaultKeyRequiredForPreferredDataTypes()) {

-                return profileSyncService.isEncryptEverythingEnabled()

-                        ? context.getString(R.string.sync_error_card_title)

-                        : context.getString(R.string.sync_passwords_error_card_title);

-            }

-

-            return context.getString(R.string.sync_and_services_summary_sync_on);

-        }

         return context.getString(R.string.sync_is_disabled);

     }

-- 

2.17.1

+import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;

+import org.chromium.chrome.browser.preferences.SharedPreferencesManager;

 import java.util.ArrayList;

 import java.util.List;

@@ -2036,11 +2039,19 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>

 import org.chromium.url.GURL;

@@ -2038,11 +2041,19 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>

         } else if (id == R.id.view_source_id) {

             currentTab.getWebContents().getNavigationController().loadUrl(new LoadUrlParams("view-source:"+currentTab.getUrlString()));

         } else if (id == R.id.request_desktop_site_id || id == R.id.request_desktop_site_check_id) {

     private static final String[] NEW_PRIVACY_PREFERENCE_ORDER = {PREF_CLEAR_BROWSING_DATA,

             PREF_CAN_MAKE_PAYMENT, PREF_NETWORK_PREDICTIONS,

             PREF_SECURE_DNS, PREF_DO_NOT_TRACK,

@@ -61,7 +80,8 @@ public class PrivacySettings

@@ -61,7 +80,8 @@ public static final String PREF_INCOGNITO_TAB_HISTORY_ENABLED = "incognito_histo

             PREF_INCOGNITO_TAB_HISTORY_ENABLED,

             PREF_ALLOW_CUSTOM_TAB_INTENTS,

             PREF_CLOSE_TABS_ON_EXIT,

         };

     private ManagedPreferenceDelegate mManagedPreferenceDelegate;

@@ -87,6 +107,29 @@ public class PrivacySettings

@@ -87,6 +107,29 @@ public static final String PREF_INCOGNITO_TAB_HISTORY_ENABLED = "incognito_histo

         mManagedPreferenceDelegate = createManagedPreferenceDelegate();

         ChromeSwitchPreference canMakePaymentPref =

                 (ChromeSwitchPreference) findPreference(PREF_CAN_MAKE_PAYMENT);

         canMakePaymentPref.setOnPreferenceChangeListener(this);

@@ -119,6 +162,11 @@ public class PrivacySettings

@@ -119,6 +162,11 @@ public static final String PREF_INCOGNITO_TAB_HISTORY_ENABLED = "incognito_histo

         } else if (PREF_CAN_MAKE_PAYMENT.equals(key)) {

             UserPrefs.get(Profile.getLastUsedRegularProfile())

                     .setBoolean(Pref.CAN_MAKE_PAYMENT_ENABLED, (boolean) newValue);

         } else if (PREF_NETWORK_PREDICTIONS.equals(key)) {

             PrivacyPreferencesManager.getInstance().setNetworkPredictionEnabled((boolean) newValue);

         } else if (PREF_ALLOW_CUSTOM_TAB_INTENTS.equals(key)) {

@@ -133,6 +181,16 @@ public class PrivacySettings

@@ -133,6 +181,16 @@ public static final String PREF_INCOGNITO_TAB_HISTORY_ENABLED = "incognito_histo

         return true;

     }

     @Override

     public void onResume() {

         super.onResume();

@@ -143,7 +201,7 @@ public class PrivacySettings

@@ -143,7 +201,7 @@ public static final String PREF_INCOGNITO_TAB_HISTORY_ENABLED = "incognito_histo

      * Updates the summaries for several preferences.

      */

     public void updateSummaries() {