chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java - Issue 2626963003: Remove kAllowed and kFallbackAllowed from data reduction proxy

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java

Issue 2626963003: Remove kAllowed and kFallbackAllowed from data reduction proxy (Closed)

Patch Set: Addressed nits Created 3 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/net/spdyproxy/DataReductionProxySettings.java ('k') | chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_io_data.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java

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

index 8d0679a67fa97d67371162c07ff04b9de1d61ecf..68a98979c7891fbbf489ad1ecfd2544a22980bdb 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java

@@ -148,13 +148,8 @@ public class MainPreferences extends PreferenceFragment

ChromeBasePreference dataReduction =

(ChromeBasePreference) findPreference(PREF_DATA_REDUCTION);

- if (DataReductionProxySettings.getInstance().isDataReductionProxyAllowed()) {

- dataReduction.setSummary(

- DataReductionPreferences.generateSummary(getResources()));

- dataReduction.setManagedPreferenceDelegate(mManagedPreferenceDelegate);

- } else {

- getPreferenceScreen().removePreference(dataReduction);

- }

+ dataReduction.setSummary(DataReductionPreferences.generateSummary(getResources()));

+ dataReduction.setManagedPreferenceDelegate(mManagedPreferenceDelegate);

if (!SigninManager.get(getActivity()).isSigninSupported()) {

getPreferenceScreen().removePreference(findPreference(PREF_SIGN_IN));