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

Unified Diff: chrome/browser/google/google_url_tracker_factory.cc

Issue 12079097: Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to head again; base::File changes conflicted. 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
« no previous file with comments | « chrome/browser/google/google_url_tracker_factory.h ('k') | chrome/browser/intents/web_intents_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/google/google_url_tracker_factory.cc
diff --git a/chrome/browser/google/google_url_tracker_factory.cc b/chrome/browser/google/google_url_tracker_factory.cc
index 732cdc15627404ea31bebd8ad3565b159b2b39e1..ad49875ec4885a088e85d87e4cf0de477da0c64c 100644
--- a/chrome/browser/google/google_url_tracker_factory.cc
+++ b/chrome/browser/google/google_url_tracker_factory.cc
@@ -5,6 +5,7 @@
#include "chrome/browser/google/google_url_tracker_factory.h"
#include "chrome/browser/google/google_url_tracker.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/common/pref_names.h"
@@ -35,13 +36,13 @@ ProfileKeyedService* GoogleURLTrackerFactory::BuildServiceInstanceFor(
}
void GoogleURLTrackerFactory::RegisterUserPrefs(
- PrefServiceSyncable* user_prefs) {
+ PrefRegistrySyncable* user_prefs) {
user_prefs->RegisterStringPref(prefs::kLastKnownGoogleURL,
GoogleURLTracker::kDefaultGoogleHomepage,
- PrefServiceSyncable::UNSYNCABLE_PREF);
+ PrefRegistrySyncable::UNSYNCABLE_PREF);
user_prefs->RegisterStringPref(prefs::kLastPromptedGoogleURL,
std::string(),
- PrefServiceSyncable::UNSYNCABLE_PREF);
+ PrefRegistrySyncable::UNSYNCABLE_PREF);
}
bool GoogleURLTrackerFactory::ServiceRedirectedInIncognito() const {
« no previous file with comments | « chrome/browser/google/google_url_tracker_factory.h ('k') | chrome/browser/intents/web_intents_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698