Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4624)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/search_engines/template_url_service_factory.cc

Issue 12079097: Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add to PrefRegistrySyncable and PrefServiceSyncable to let sync know of pre-registered prefs. Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« chrome/browser/profiles/profile_keyed_base_factory.cc ('K') | « chrome/browser/search_engines/template_url_service_factory.h ('k') | chrome/browser/signin/about_signin_internals_factory.h » ('j') | chrome/browser/sync/invalidations/invalidator_storage.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 6a63158c82afd308ed87862a8769c066952fa0cc..a18ecce946bc8b1677fedcb7c7ba18eb8cafcbc1 100644
--- a/chrome/browser/search_engines/template_url_service_factory.cc
+++ b/chrome/browser/search_engines/template_url_service_factory.cc
@@ -6,6 +6,7 @@
#include "chrome/browser/google/google_url_tracker_factory.h"
#include "chrome/browser/history/history_service_factory.h"
+#include "chrome/browser/prefs/pref_registry_syncable.h"
#include "chrome/browser/prefs/pref_service.h"
#include "chrome/browser/profiles/profile_dependency_manager.h"
#include "chrome/browser/search_engines/template_url_service.h"
@@ -44,46 +45,47 @@ ProfileKeyedService* TemplateURLServiceFactory::BuildServiceInstanceFor(
return BuildInstanceFor(profile);
}
-void TemplateURLServiceFactory::RegisterUserPrefs(PrefServiceSyncable* prefs) {
- prefs->RegisterStringPref(prefs::kSyncedDefaultSearchProviderGUID,
- std::string(),
- PrefServiceSyncable::SYNCABLE_PREF);
- prefs->RegisterBooleanPref(prefs::kDefaultSearchProviderEnabled,
- true,
- PrefServiceSyncable::UNSYNCABLE_PREF);
- prefs->RegisterStringPref(prefs::kDefaultSearchProviderName,
- std::string(),
- PrefServiceSyncable::UNSYNCABLE_PREF);
- prefs->RegisterStringPref(prefs::kDefaultSearchProviderID,
- std::string(),
- PrefServiceSyncable::UNSYNCABLE_PREF);
- prefs->RegisterStringPref(prefs::kDefaultSearchProviderPrepopulateID,
- std::string(),
- PrefServiceSyncable::UNSYNCABLE_PREF);
- prefs->RegisterStringPref(prefs::kDefaultSearchProviderSuggestURL,
- std::string(),
- PrefServiceSyncable::UNSYNCABLE_PREF);
- prefs->RegisterStringPref(prefs::kDefaultSearchProviderSearchURL,
- std::string(),
- PrefServiceSyncable::UNSYNCABLE_PREF);
- prefs->RegisterStringPref(prefs::kDefaultSearchProviderInstantURL,
- std::string(),
- PrefServiceSyncable::UNSYNCABLE_PREF);
- prefs->RegisterStringPref(prefs::kDefaultSearchProviderKeyword,
- std::string(),
- PrefServiceSyncable::UNSYNCABLE_PREF);
- prefs->RegisterStringPref(prefs::kDefaultSearchProviderIconURL,
- std::string(),
- PrefServiceSyncable::UNSYNCABLE_PREF);
- prefs->RegisterStringPref(prefs::kDefaultSearchProviderEncodings,
- std::string(),
- PrefServiceSyncable::UNSYNCABLE_PREF);
- prefs->RegisterListPref(prefs::kDefaultSearchProviderAlternateURLs,
- PrefServiceSyncable::UNSYNCABLE_PREF);
- prefs->RegisterStringPref(
+void TemplateURLServiceFactory::RegisterUserPrefs(
+ 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);
+ registry->RegisterListPref(prefs::kDefaultSearchProviderAlternateURLs,
+ PrefRegistrySyncable::UNSYNCABLE_PREF);
+ registry->RegisterStringPref(
prefs::kDefaultSearchProviderSearchTermsReplacementKey,
std::string(),
- PrefServiceSyncable::UNSYNCABLE_PREF);
+ PrefRegistrySyncable::UNSYNCABLE_PREF);
}
bool TemplateURLServiceFactory::ServiceRedirectedInIncognito() const {
« chrome/browser/profiles/profile_keyed_base_factory.cc ('K') | « chrome/browser/search_engines/template_url_service_factory.h ('k') | chrome/browser/signin/about_signin_internals_factory.h » ('j') | chrome/browser/sync/invalidations/invalidator_storage.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698