chrome/browser/prefs/pref_set_observer.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/prefs/pref_set_observer.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/prefs/pref_service_unittest.cc ('k') | chrome/browser/prefs/proxy_prefs.h » ('j') | chrome/browser/prefs/proxy_prefs.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/prefs/pref_set_observer.cc

diff --git a/chrome/browser/prefs/pref_set_observer.cc b/chrome/browser/prefs/pref_set_observer.cc

index 499aa521168743b21da0b723219571e67a9c2990..117937e2bb7077a5a6ded6224d4ce433b48df24e 100644

--- a/chrome/browser/prefs/pref_set_observer.cc

+++ b/chrome/browser/prefs/pref_set_observer.cc

@@ -47,10 +47,7 @@ PrefSetObserver* PrefSetObserver::CreateProxyPrefSetObserver(

PrefService* pref_service,

NotificationObserver* observer) {

PrefSetObserver* pref_set = new PrefSetObserver(pref_service, observer);

- pref_set->AddPref(prefs::kProxyMode);

- pref_set->AddPref(prefs::kProxyServer);

- pref_set->AddPref(prefs::kProxyPacUrl);

- pref_set->AddPref(prefs::kProxyBypassList);

+ pref_set->AddPref(prefs::kProxy);

return pref_set;

}