diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-10 02:47:40 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-10 02:47:40 +0000 |
| commit | 2758379366b4aafde0bce40b7d619840080b5387 (patch) | |
| tree | cd857f396623774ffd2aff407702600d510a440a /chrome/browser/prefs | |
| parent | 2b77854cdeea417983c5debf5e77db5f7f3ae306 (diff) | |
| download | chromium_src-2758379366b4aafde0bce40b7d619840080b5387.zip chromium_src-2758379366b4aafde0bce40b7d619840080b5387.tar.gz chromium_src-2758379366b4aafde0bce40b7d619840080b5387.tar.bz2 | |
Revert 59020 - Add constants for preferences and policies related to the Default Search Provider. Add code to read these new policies into prefs. Add code to enable monitoring change to these preferences.
BUG=49306
TEST=ConfigurationPolicyPrefStoreTest.* and ConfigurationPolicyProviderWinTest.*
Review URL: http://codereview.chromium.org/3359012
TBR=jeanluc@google.com
Review URL: http://codereview.chromium.org/3357026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59040 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/prefs')
| -rw-r--r-- | chrome/browser/prefs/pref_set_observer.cc | 15 | ||||
| -rw-r--r-- | chrome/browser/prefs/pref_set_observer.h | 7 |
2 files changed, 1 insertions, 21 deletions
diff --git a/chrome/browser/prefs/pref_set_observer.cc b/chrome/browser/prefs/pref_set_observer.cc index a4ecf6f..0f41500 100644 --- a/chrome/browser/prefs/pref_set_observer.cc +++ b/chrome/browser/prefs/pref_set_observer.cc @@ -58,21 +58,6 @@ PrefSetObserver* PrefSetObserver::CreateProxyPrefSetObserver( return pref_set; } -// static -PrefSetObserver* PrefSetObserver::CreateDefaultSearchPrefSetObserver( - PrefService* pref_service, - NotificationObserver* observer) { - PrefSetObserver* pref_set = new PrefSetObserver(pref_service, observer); - pref_set->AddPref(prefs::kDefaultSearchProviderName); - pref_set->AddPref(prefs::kDefaultSearchProviderKeyword); - pref_set->AddPref(prefs::kDefaultSearchProviderSearchURL); - pref_set->AddPref(prefs::kDefaultSearchProviderSuggestURL); - pref_set->AddPref(prefs::kDefaultSearchProviderIconURL); - pref_set->AddPref(prefs::kDefaultSearchProviderEncodings); - - return pref_set; -} - void PrefSetObserver::Observe(NotificationType type, const NotificationSource& source, const NotificationDetails& details) { diff --git a/chrome/browser/prefs/pref_set_observer.h b/chrome/browser/prefs/pref_set_observer.h index beaec01..038a3f5 100644 --- a/chrome/browser/prefs/pref_set_observer.h +++ b/chrome/browser/prefs/pref_set_observer.h @@ -31,16 +31,11 @@ class PrefSetObserver : public NotificationObserver { // Check whether any of the observed preferences has the managed bit set. bool IsManaged(); - // Create a pref set observer for all preferences relevant to proxies. + // Create a pref set observer for all preferences relavant to proxies. static PrefSetObserver* CreateProxyPrefSetObserver( PrefService* pref_service, NotificationObserver* observer); - // Create a pref set observer for all preferences relevant to default search. - static PrefSetObserver* CreateDefaultSearchPrefSetObserver( - PrefService* pref_service, - NotificationObserver* observer); - private: // Overridden from NotificationObserver. virtual void Observe(NotificationType type, |