chrome/browser/policy/managed_prefs_banner_base.cc - Issue 6240013: Make proxy settings one atomic dictionary in the PrefStores such that modifications are atomic.

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

Issue 6240013: Make proxy settings one atomic dictionary in the PrefStores such that modifications are atomic. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/out/Debug

Patch Set: Updated to ToT and addressed Matt's comments in base-CL Created 9 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

« chrome/browser/policy/configuration_policy_pref_store_unittest.cc ('K') | « chrome/browser/policy/configuration_policy_pref_store_unittest.cc ('k') | chrome/browser/prefs/command_line_pref_store.cc » ('j') | chrome/browser/prefs/proxy_prefs.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/policy/managed_prefs_banner_base.cc

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

index 26930540c99bbb5be8146c9d1b2660af9954c924..b369cec324b4ecc15a500427a86b686f08f4cc4e 100644

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

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

@@ -86,10 +86,7 @@ void ManagedPrefsBannerBase::Init(PrefService* local_state,

#if defined(GOOGLE_CHROME_BUILD)

AddLocalStatePref(prefs::kMetricsReportingEnabled);

#endif

- AddUserPref(prefs::kProxyMode);

- AddUserPref(prefs::kProxyServer);

- AddUserPref(prefs::kProxyPacUrl);

- AddUserPref(prefs::kProxyBypassList);

+ AddUserPref(prefs::kProxy);

break;

default:

NOTREACHED();