|
@@ -32,7 +32,7 @@ Fix build from scratch (issue found by nikolowry)
|
|
|
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
|
|
|
--- a/chrome/android/BUILD.gn
|
|
|
+++ b/chrome/android/BUILD.gn
|
|
|
-@@ -2636,7 +2636,6 @@ generate_jni("chrome_jni_headers") {
|
|
|
+@@ -2634,7 +2634,6 @@ generate_jni("chrome_jni_headers") {
|
|
|
"java/src/org/chromium/chrome/browser/rappor/RapporServiceBridge.java",
|
|
|
"java/src/org/chromium/chrome/browser/rlz/RevenueStats.java",
|
|
|
"java/src/org/chromium/chrome/browser/rlz/RlzPingHandler.java",
|
|
@@ -72,7 +72,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";
|
|
@@ -82,7 +82,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));
|
|
@@ -91,7 +91,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));
|
|
|
}
|
|
|
|
|
@@ -109,7 +109,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);
|
|
@@ -121,7 +121,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);
|
|
|
-@@ -203,19 +182,6 @@ public class PrivacyPreferences extends PreferenceFragment
|
|
|
+@@ -186,19 +165,6 @@ public class PrivacyPreferences extends PreferenceFragment
|
|
|
searchSuggestionsPref.setChecked(prefServiceBridge.isSearchSuggestEnabled());
|
|
|
}
|
|
|
|
|
@@ -141,7 +141,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) {
|
|
|
-@@ -271,12 +237,6 @@ public class PrivacyPreferences extends PreferenceFragment
|
|
|
+@@ -254,12 +220,6 @@ public class PrivacyPreferences extends PreferenceFragment
|
|
|
if (PREF_SEARCH_SUGGESTIONS.equals(key)) {
|
|
|
return prefs.isSearchSuggestManaged();
|
|
|
}
|