diff options
| author | jeanluc@google.com <jeanluc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-05 23:49:31 +0000 |
|---|---|---|
| committer | jeanluc@google.com <jeanluc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-05 23:49:31 +0000 |
| commit | b6fd1fa73e3905cb343a78b84a88aef3cb53ab40 (patch) | |
| tree | 61b04a98b99aaca3138b868402b2005b59594119 /chrome/browser/prefs | |
| parent | 2858bbf9099f835325422009c5945e9b26a97d42 (diff) | |
| download | chromium_src-b6fd1fa73e3905cb343a78b84a88aef3cb53ab40.zip chromium_src-b6fd1fa73e3905cb343a78b84a88aef3cb53ab40.tar.gz chromium_src-b6fd1fa73e3905cb343a78b84a88aef3cb53ab40.tar.bz2 | |
Allow the default search provider to be specified via group policy. Also allow group policy to specify that there is no default. Respond to at run time to changes of policy. Handle the default search becoming managed or un-managed, or having the default change while staying managed. Optimize notification of observers so that we don't repeatedly notify observers for what is one change.
Change in Preferences.xib: Add defaultSearchEngineEnabled keypath to enable/disable the default search engine combobox in the Basic preference pane.
BUG=49306
TEST=ConfigurationPolicyPrefStoreDefaultSearchTest.*, TemplateURLModelTest.*, KeywordEditorControllerTest*, SearchProviderInstall*, ConfigDirPolicyProviderValueTestInstance*, ConfigurationPolicyProvider*
Review URL: http://codereview.chromium.org/3402023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61588 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/prefs')
| -rw-r--r-- | chrome/browser/prefs/browser_prefs.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/prefs/pref_set_observer.cc | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc index 03d18f4..538b89b 100644 --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc @@ -40,6 +40,7 @@ #include "chrome/browser/renderer_host/web_cache_manager.h" #include "chrome/browser/safe_browsing/safe_browsing_service.h" #include "chrome/browser/search_engines/keyword_editor_controller.h" +#include "chrome/browser/search_engines/template_url_model.h" #include "chrome/browser/search_engines/template_url_prepopulate_data.h" #include "chrome/browser/ssl/ssl_manager.h" #include "chrome/browser/sync/signin_manager.h" @@ -143,6 +144,7 @@ void RegisterUserPrefs(PrefService* user_prefs) { #endif BackgroundContentsService::RegisterUserPrefs(user_prefs); SigninManager::RegisterUserPrefs(user_prefs); + TemplateURLModel::RegisterUserPrefs(user_prefs); } } // namespace browser diff --git a/chrome/browser/prefs/pref_set_observer.cc b/chrome/browser/prefs/pref_set_observer.cc index dd067d3..70810c6 100644 --- a/chrome/browser/prefs/pref_set_observer.cc +++ b/chrome/browser/prefs/pref_set_observer.cc @@ -59,6 +59,7 @@ PrefSetObserver* PrefSetObserver::CreateDefaultSearchPrefSetObserver( PrefService* pref_service, NotificationObserver* observer) { PrefSetObserver* pref_set = new PrefSetObserver(pref_service, observer); + pref_set->AddPref(prefs::kDefaultSearchProviderEnabled); pref_set->AddPref(prefs::kDefaultSearchProviderName); pref_set->AddPref(prefs::kDefaultSearchProviderKeyword); pref_set->AddPref(prefs::kDefaultSearchProviderSearchURL); |