|
@@ -18,8 +18,7 @@ ld.lld: error: undefined symbol: notifier::NotifierOptions::NotifierOptions()
|
|
|
---
|
|
|
chrome/android/BUILD.gn | 4 +-
|
|
|
chrome/android/java/AndroidManifest.xml | 27 -----
|
|
|
- chrome/android/java/res/xml/main_preferences.xml | 20 ----
|
|
|
- .../android/java/res/xml/privacy_preferences.xml | 7 --
|
|
|
+ chrome/android/java/res/xml/main_preferences.xml | 14 ---
|
|
|
.../chromium/chrome/browser/ChromeActivity.java | 34 ------
|
|
|
.../browser/preferences/MainPreferences.java | 86 +--------------
|
|
|
.../DataReductionPreferenceFragment.java | 17 +--
|
|
@@ -35,7 +34,7 @@ ld.lld: error: undefined symbol: notifier::NotifierOptions::NotifierOptions()
|
|
|
.../components/sync/AndroidSyncSettings.java | 24 +---
|
|
|
.../chromium/net/HttpNegotiateAuthenticator.java | 122 +--------------------
|
|
|
.../chromoting/base/OAuthTokenFetcher.java | 2 -
|
|
|
- 19 files changed, 26 insertions(+), 501 deletions(-)
|
|
|
+ 18 files changed, 26 insertions(+), 488 deletions(-)
|
|
|
|
|
|
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
|
|
|
--- a/chrome/android/BUILD.gn
|
|
@@ -129,7 +128,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro
|
|
|
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
|
|
|
-@@ -7,21 +7,6 @@
|
|
|
+@@ -7,15 +7,6 @@
|
|
|
android:orderingFromXml="false">
|
|
|
|
|
|
<PreferenceCategory
|
|
@@ -140,18 +139,12 @@ diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/j
|
|
|
- android:key="sign_in"
|
|
|
- android:order="1"
|
|
|
- android:title="@string/sign_in_to_chrome"/>
|
|
|
-- <org.chromium.chrome.browser.preferences.ChromeBasePreference
|
|
|
-- android:key="sync_and_services"
|
|
|
-- android:order="2"
|
|
|
-- android:layout="@layout/account_management_account_row"
|
|
|
-- android:title="@string/prefs_sync_and_services"
|
|
|
-- android:fragment="org.chromium.chrome.browser.preferences.sync.SyncAndServicesPreferences"/>
|
|
|
-
|
|
|
- <PreferenceCategory
|
|
|
android:key="basics_section"
|
|
|
android:order="3"
|
|
|
android:title="@string/prefs_section_basics"/>
|
|
|
-@@ -91,11 +76,6 @@
|
|
|
+@@ -85,11 +76,6 @@
|
|
|
android:order="16"
|
|
|
android:title="@string/prefs_languages"/>
|
|
|
<org.chromium.chrome.browser.preferences.ChromeBasePreference
|
|
@@ -163,22 +156,6 @@ diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/j
|
|
|
android:fragment="org.chromium.chrome.browser.preferences.download.DownloadPreferences"
|
|
|
android:key="downloads"
|
|
|
android:order="18"
|
|
|
-diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
|
|
|
---- a/chrome/android/java/res/xml/privacy_preferences.xml
|
|
|
-+++ b/chrome/android/java/res/xml/privacy_preferences.xml
|
|
|
-@@ -33,12 +33,5 @@
|
|
|
- android:title="@string/clear_browsing_data_title"
|
|
|
- android:summary="@string/clear_browsing_data_summary"
|
|
|
- android:fragment="org.chromium.chrome.browser.preferences.privacy.ClearBrowsingDataTabsFragment" />
|
|
|
-- <android.support.v7.preference.Preference
|
|
|
-- android:key="sync_and_services_link_divider"
|
|
|
-- android:layout="@layout/divider_preference"
|
|
|
-- android:selectable="false"/>
|
|
|
-- <org.chromium.chrome.browser.preferences.TextMessagePreference
|
|
|
-- android:key="sync_and_services_link"
|
|
|
-- android:summary="@string/privacy_sync_and_services_link"
|
|
|
- app:allowDividerBelow="false" />
|
|
|
- </PreferenceScreen>
|
|
|
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
|
|
|
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
|
|
|
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java
|