summaryrefslogtreecommitdiffstats
path: root/chrome/browser/prefs/pref_set_observer.cc
diff options
context:
space:
mode:
authorbattre@chromium.org <battre@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-09 14:52:17 +0000
committerbattre@chromium.org <battre@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-09 14:52:17 +0000
commitc2f23d014bb8f371cd7b454c09c3e0bf291620e8 (patch)
treea84c232915f9654969a913ad9a5926479448c846 /chrome/browser/prefs/pref_set_observer.cc
parent559a9bd2ab0d32b79e1c938159d952b1b329b7ee (diff)
downloadchromium_src-c2f23d014bb8f371cd7b454c09c3e0bf291620e8.zip
chromium_src-c2f23d014bb8f371cd7b454c09c3e0bf291620e8.tar.gz
chromium_src-c2f23d014bb8f371cd7b454c09c3e0bf291620e8.tar.bz2
Make proxy settings one atomic dictionary in the PrefStores such that modifications are atomic.
BUG=67779,70904 TEST=none Review URL: http://codereview.chromium.org/6240013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74284 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/prefs/pref_set_observer.cc')
-rw-r--r--chrome/browser/prefs/pref_set_observer.cc5
1 files changed, 1 insertions, 4 deletions
diff --git a/chrome/browser/prefs/pref_set_observer.cc b/chrome/browser/prefs/pref_set_observer.cc
index 499aa52..117937e 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;
}