|
@@ -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
|
|
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
|
|
--- 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
|
|
+++ 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 {
|
|
implements OnPreferenceChangeListener {
|
|
private static final String PREF_NAVIGATION_ERROR = "navigation_error";
|
|
private static final String PREF_NAVIGATION_ERROR = "navigation_error";
|
|
private static final String PREF_SEARCH_SUGGESTIONS = "search_suggestions";
|
|
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_CAN_MAKE_PAYMENT = "can_make_payment";
|
|
private static final String PREF_CONTEXTUAL_SEARCH = "contextual_search";
|
|
private static final String PREF_CONTEXTUAL_SEARCH = "contextual_search";
|
|
private static final String PREF_NETWORK_PREDICTIONS = "network_predictions";
|
|
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.
|
|
// Remove preferences that were migrated to SyncAndServicesPreferences.
|
|
preferenceScreen.removePreference(findPreference(PREF_NAVIGATION_ERROR));
|
|
preferenceScreen.removePreference(findPreference(PREF_NAVIGATION_ERROR));
|
|
preferenceScreen.removePreference(findPreference(PREF_SEARCH_SUGGESTIONS));
|
|
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_CONTEXTUAL_SEARCH));
|
|
preferenceScreen.removePreference(findPreference(PREF_USAGE_AND_CRASH_REPORTING));
|
|
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));
|
|
preferenceScreen.removePreference(findPreference(PREF_CONTEXTUAL_SEARCH));
|
|
}
|
|
}
|
|
|
|
|
|
@@ -82,7 +82,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
|
|
updateSummaries();
|
|
updateSummaries();
|
|
}
|
|
}
|
|
|
|
|
|
-@@ -150,11 +134,6 @@ public class PrivacyPreferences extends PreferenceFragment
|
|
|
|
|
|
+@@ -133,11 +117,6 @@ public class PrivacyPreferences extends PreferenceFragment
|
|
String key = preference.getKey();
|
|
String key = preference.getKey();
|
|
if (PREF_SEARCH_SUGGESTIONS.equals(key)) {
|
|
if (PREF_SEARCH_SUGGESTIONS.equals(key)) {
|
|
PrefServiceBridge.getInstance().setSearchSuggestEnabled((boolean) newValue);
|
|
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)) {
|
|
} else if (PREF_NETWORK_PREDICTIONS.equals(key)) {
|
|
PrefServiceBridge.getInstance().setNetworkPredictionEnabled((boolean) newValue);
|
|
PrefServiceBridge.getInstance().setNetworkPredictionEnabled((boolean) newValue);
|
|
recordNetworkPredictionEnablingUMA((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());
|
|
searchSuggestionsPref.setChecked(prefServiceBridge.isSearchSuggestEnabled());
|
|
}
|
|
}
|
|
|
|
|
|
@@ -114,7 +114,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/pri
|
|
CheckBoxPreference canMakePaymentPref =
|
|
CheckBoxPreference canMakePaymentPref =
|
|
(CheckBoxPreference) findPreference(PREF_CAN_MAKE_PAYMENT);
|
|
(CheckBoxPreference) findPreference(PREF_CAN_MAKE_PAYMENT);
|
|
if (canMakePaymentPref != null) {
|
|
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)) {
|
|
if (PREF_SEARCH_SUGGESTIONS.equals(key)) {
|
|
return prefs.isSearchSuggestManaged();
|
|
return prefs.isSearchSuggestManaged();
|
|
}
|
|
}
|
|
@@ -150,7 +150,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
|
|
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
|
|
--- a/chrome/browser/chrome_content_browser_client.cc
|
|
+++ b/chrome/browser/chrome_content_browser_client.cc
|
|
+++ b/chrome/browser/chrome_content_browser_client.cc
|
|
-@@ -118,7 +118,6 @@
|
|
|
|
|
|
+@@ -120,7 +120,6 @@
|
|
#include "chrome/browser/safe_browsing/certificate_reporting_service.h"
|
|
#include "chrome/browser/safe_browsing/certificate_reporting_service.h"
|
|
#include "chrome/browser/safe_browsing/certificate_reporting_service_factory.h"
|
|
#include "chrome/browser/safe_browsing/certificate_reporting_service_factory.h"
|
|
#include "chrome/browser/safe_browsing/chrome_password_protection_service.h"
|
|
#include "chrome/browser/safe_browsing/chrome_password_protection_service.h"
|
|
@@ -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/safe_browsing_service.h"
|
|
#include "chrome/browser/safe_browsing/ui_manager.h"
|
|
#include "chrome/browser/safe_browsing/ui_manager.h"
|
|
#include "chrome/browser/safe_browsing/url_checker_delegate_impl.h"
|
|
#include "chrome/browser/safe_browsing/url_checker_delegate_impl.h"
|
|
-@@ -4346,11 +4345,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
|
|
|
|
|
|
+@@ -4356,11 +4355,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
|
|
PreviewsLitePageDecider::MaybeCreateThrottleFor(handle);
|
|
PreviewsLitePageDecider::MaybeCreateThrottleFor(handle);
|
|
if (previews_lite_page_throttle)
|
|
if (previews_lite_page_throttle)
|
|
throttles.push_back(std::move(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) || \
|
|
#if defined(OS_WIN) || defined(OS_MACOSX) || \
|
|
(defined(OS_LINUX) && !defined(OS_CHROMEOS))
|
|
(defined(OS_LINUX) && !defined(OS_CHROMEOS))
|
|
-@@ -5303,19 +5297,7 @@ ChromeContentBrowserClient::GetSafeBrowsingUrlCheckerDelegate(
|
|
|
|
|
|
+@@ -5313,19 +5307,7 @@ ChromeContentBrowserClient::GetSafeBrowsingUrlCheckerDelegate(
|
|
content::ResourceContext* resource_context) {
|
|
content::ResourceContext* resource_context) {
|
|
DCHECK_CURRENTLY_ON(BrowserThread::IO);
|
|
DCHECK_CURRENTLY_ON(BrowserThread::IO);
|
|
|
|
|