chrome/browser/managed_prefs_banner_base.cc - Issue 3067017: Merge 53457 - Disable proxy config button and show banner if proxy prefs are managed.

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/browser/managed_prefs_banner_base.cc

Issue 3067017: Merge 53457 - Disable proxy config button and show banner if proxy prefs are managed. (Closed) Base URL: http://src.chromium.org/git/chromium.git

Patch Set: Created 10 years, 5 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

Index: chrome/browser/managed_prefs_banner_base.cc

diff --git a/chrome/browser/managed_prefs_banner_base.cc b/chrome/browser/managed_prefs_banner_base.cc

index 225db8d7b16f0632512f4b773e25b44a56824c11..28c6b460e317c8766c33773a224ea65002bbb542 100644

--- a/chrome/browser/managed_prefs_banner_base.cc

+++ b/chrome/browser/managed_prefs_banner_base.cc

@@ -30,6 +30,11 @@ ManagedPrefsBannerBase::ManagedPrefsBannerBase(PrefService* prefs,

#if defined(GOOGLE_CHROME_BUILD)

AddPref(prefs::kMetricsReportingEnabled);

#endif

+ AddPref(prefs::kNoProxyServer);

+ AddPref(prefs::kProxyAutoDetect);

+ AddPref(prefs::kProxyServer);

+ AddPref(prefs::kProxyPacUrl);

+ AddPref(prefs::kProxyBypassList);

break;

default:

NOTREACHED();

« no previous file with comments | « chrome/browser/gtk/options/advanced_contents_gtk.cc ('k') | chrome/browser/pref_service.h » ('j') | no next file with comments »