chrome/browser/search_engines/template_url_prepopulate_data.cc - Issue 11570009: Split PrefService into PrefService, PrefServiceSimple and PrefServiceSyncable.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 11570009: Split PrefService into PrefService, PrefServiceSimple and PrefServiceSyncable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Merge to head again, previous had unrelated broken win_rel test. Created 8 years 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/search_engines/template_url_prepopulate_data.h ('k') | chrome/browser/search_engines/template_url_prepopulate_data_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/search_engines/template_url_prepopulate_data.cc

diff --git a/chrome/browser/search_engines/template_url_prepopulate_data.cc b/chrome/browser/search_engines/template_url_prepopulate_data.cc

index 9e9e27937c84d79df68a3f54c66ed18a2d9e1f55..fa0fc4f4c4e729b12fbf103de6444a9baf3cfede 100644

--- a/chrome/browser/search_engines/template_url_prepopulate_data.cc

+++ b/chrome/browser/search_engines/template_url_prepopulate_data.cc

@@ -1088,19 +1088,19 @@ const LogoURLs google_logos = {

////////////////////////////////////////////////////////////////////////////////

-void RegisterUserPrefs(PrefService* prefs) {

+void RegisterUserPrefs(PrefServiceSyncable* prefs) {

prefs->RegisterIntegerPref(prefs::kCountryIDAtInstall,

kCountryIDUnknown,

- PrefService::UNSYNCABLE_PREF);

+ PrefServiceSyncable::UNSYNCABLE_PREF);

prefs->RegisterListPref(prefs::kSearchProviderOverrides,

- PrefService::UNSYNCABLE_PREF);

+ PrefServiceSyncable::UNSYNCABLE_PREF);

prefs->RegisterIntegerPref(prefs::kSearchProviderOverridesVersion,

-1,

- PrefService::UNSYNCABLE_PREF);

+ PrefServiceSyncable::UNSYNCABLE_PREF);

// Obsolete pref, for migration.

prefs->RegisterIntegerPref(prefs::kGeoIDAtInstall,

-1,

- PrefService::UNSYNCABLE_PREF);

+ PrefServiceSyncable::UNSYNCABLE_PREF);

}

int GetDataVersion(PrefService* prefs) {