| Index: chrome/browser/search_engines/template_url_service_factory.cc
|
| diff --git a/chrome/browser/search_engines/template_url_service_factory.cc b/chrome/browser/search_engines/template_url_service_factory.cc
|
| index 5a4b23c6ef7a6e948312ad37379179db81978a1a..4112ffdccabb440b3617092df6e7d8131c1fa08d 100644
|
| --- a/chrome/browser/search_engines/template_url_service_factory.cc
|
| +++ b/chrome/browser/search_engines/template_url_service_factory.cc
|
| @@ -47,46 +47,56 @@ ProfileKeyedService* TemplateURLServiceFactory::BuildServiceInstanceFor(
|
| }
|
|
|
| void TemplateURLServiceFactory::RegisterUserPrefs(
|
| - PrefRegistrySyncable* registry) {
|
| + user_prefs::PrefRegistrySyncable* registry) {
|
| registry->RegisterStringPref(prefs::kSyncedDefaultSearchProviderGUID,
|
| std::string(),
|
| - PrefRegistrySyncable::SYNCABLE_PREF);
|
| - registry->RegisterBooleanPref(prefs::kDefaultSearchProviderEnabled,
|
| - true,
|
| - PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| - registry->RegisterStringPref(prefs::kDefaultSearchProviderName,
|
| - std::string(),
|
| - PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| - registry->RegisterStringPref(prefs::kDefaultSearchProviderID,
|
| - std::string(),
|
| - PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| - registry->RegisterStringPref(prefs::kDefaultSearchProviderPrepopulateID,
|
| - std::string(),
|
| - PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| - registry->RegisterStringPref(prefs::kDefaultSearchProviderSuggestURL,
|
| - std::string(),
|
| - PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| - registry->RegisterStringPref(prefs::kDefaultSearchProviderSearchURL,
|
| - std::string(),
|
| - PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| - registry->RegisterStringPref(prefs::kDefaultSearchProviderInstantURL,
|
| - std::string(),
|
| - PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| - registry->RegisterStringPref(prefs::kDefaultSearchProviderKeyword,
|
| - std::string(),
|
| - PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| - registry->RegisterStringPref(prefs::kDefaultSearchProviderIconURL,
|
| - std::string(),
|
| - PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| - registry->RegisterStringPref(prefs::kDefaultSearchProviderEncodings,
|
| - std::string(),
|
| - PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| + user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
|
| + registry->RegisterBooleanPref(
|
| + prefs::kDefaultSearchProviderEnabled,
|
| + true,
|
| + user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| + registry->RegisterStringPref(
|
| + prefs::kDefaultSearchProviderName,
|
| + std::string(),
|
| + user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| + registry->RegisterStringPref(
|
| + prefs::kDefaultSearchProviderID,
|
| + std::string(),
|
| + user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| + registry->RegisterStringPref(
|
| + prefs::kDefaultSearchProviderPrepopulateID,
|
| + std::string(),
|
| + user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| + registry->RegisterStringPref(
|
| + prefs::kDefaultSearchProviderSuggestURL,
|
| + std::string(),
|
| + user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| + registry->RegisterStringPref(
|
| + prefs::kDefaultSearchProviderSearchURL,
|
| + std::string(),
|
| + user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| + registry->RegisterStringPref(
|
| + prefs::kDefaultSearchProviderInstantURL,
|
| + std::string(),
|
| + user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| + registry->RegisterStringPref(
|
| + prefs::kDefaultSearchProviderKeyword,
|
| + std::string(),
|
| + user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| + registry->RegisterStringPref(
|
| + prefs::kDefaultSearchProviderIconURL,
|
| + std::string(),
|
| + user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| + registry->RegisterStringPref(
|
| + prefs::kDefaultSearchProviderEncodings,
|
| + std::string(),
|
| + user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| registry->RegisterListPref(prefs::kDefaultSearchProviderAlternateURLs,
|
| - PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| + user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| registry->RegisterStringPref(
|
| prefs::kDefaultSearchProviderSearchTermsReplacementKey,
|
| std::string(),
|
| - PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| + user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
|
| }
|
|
|
| content::BrowserContext* TemplateURLServiceFactory::GetBrowserContextToUse(
|
|
|