diff options
| author | stevet@chromium.org <stevet@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-14 15:05:32 +0000 |
|---|---|---|
| committer | stevet@chromium.org <stevet@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-14 15:05:32 +0000 |
| commit | defd5908a5cd5feaacc1f1c839bd2023438565cd (patch) | |
| tree | ecdd975a3fc4685c741bb1a7a42816224170b261 /chrome/browser/prefs/pref_set_observer.cc | |
| parent | b910d07c7d8239907d7821726573e4a9f844d98c (diff) | |
| download | chromium_src-defd5908a5cd5feaacc1f1c839bd2023438565cd.zip chromium_src-defd5908a5cd5feaacc1f1c839bd2023438565cd.tar.gz chromium_src-defd5908a5cd5feaacc1f1c839bd2023438565cd.tar.bz2 | |
Merge search engines sync data type with Preferences. Sync the default search provider. Add some defensive measures to prevent deletion of the default search engine or unnecessarily uniquifying keywords.
TEST=Ensure that the default search provider syncs when the Preferences sync data type is enabled. Ensure that the normal search engine syncing changes (add, update, delete) all work.
BUG=15548
Review URL: http://codereview.chromium.org/8334030
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109882 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/prefs/pref_set_observer.cc')
| -rw-r--r-- | chrome/browser/prefs/pref_set_observer.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/chrome/browser/prefs/pref_set_observer.cc b/chrome/browser/prefs/pref_set_observer.cc index 92b8fa6..2486621 100644 --- a/chrome/browser/prefs/pref_set_observer.cc +++ b/chrome/browser/prefs/pref_set_observer.cc @@ -65,6 +65,7 @@ PrefSetObserver* PrefSetObserver::CreateDefaultSearchPrefSetObserver( pref_set->AddPref(prefs::kDefaultSearchProviderIconURL); pref_set->AddPref(prefs::kDefaultSearchProviderInstantURL); pref_set->AddPref(prefs::kDefaultSearchProviderEncodings); + pref_set->AddPref(prefs::kSyncedDefaultSearchProviderGUID); return pref_set; } |