chrome/browser/search_engines/template_url_prepopulate_data.cc - Issue 6905044: Refactor preference syncing.

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 6905044: Refactor preference syncing. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Really fix. And rebase Created 9 years, 7 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:

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 4498c4890b3ddcc8caafbff63105a11d65c09e59..e19384e8d49acc8b280f5ee5a128651294087a5d 100644

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

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

@@ -3341,11 +3341,18 @@ void GetPrepopulationSetFromCountryID(PrefService* prefs,

namespace TemplateURLPrepopulateData {

void RegisterUserPrefs(PrefService* prefs) {

- prefs->RegisterIntegerPref(prefs::kCountryIDAtInstall, kCountryIDUnknown);

- prefs->RegisterListPref(prefs::kSearchProviderOverrides);

- prefs->RegisterIntegerPref(prefs::kSearchProviderOverridesVersion, -1);

+ prefs->RegisterIntegerPref(prefs::kCountryIDAtInstall,

+ kCountryIDUnknown,

+ PrefService::UNSYNCABLE_PREF);

+ prefs->RegisterListPref(prefs::kSearchProviderOverrides,

+ PrefService::UNSYNCABLE_PREF);

+ prefs->RegisterIntegerPref(prefs::kSearchProviderOverridesVersion,

+ -1,

+ PrefService::UNSYNCABLE_PREF);

// Obsolete pref, for migration.

- prefs->RegisterIntegerPref(prefs::kGeoIDAtInstall, -1);

+ prefs->RegisterIntegerPref(prefs::kGeoIDAtInstall,

+ -1,

+ PrefService::UNSYNCABLE_PREF);

}

int GetDataVersion(PrefService* prefs) {