chrome/browser/search_engines/template_url_prepopulate_data.cc - Issue 12079097: Introduce PrefRegistrySyncable, simplifying 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 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/search_engines/template_url_prepopulate_data.h ('k') | chrome/browser/search_engines/template_url_service_factory.h » ('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 b2a857bcef5c5ab529f8b269d3a0ee8535b4c701..8bfba726e5436c272b41e6e041aaf8033141d8bc 100644

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

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

@@ -11,12 +11,13 @@

#include "base/command_line.h"

#include "base/logging.h"

#include "base/memory/scoped_vector.h"

+#include "base/stl_util.h"

#include "base/string16.h"

#include "base/string_piece.h"

#include "base/string_util.h"

-#include "base/stl_util.h"

#include "base/utf_string_conversions.h"

#include "chrome/browser/google/google_util.h"

+#include "chrome/browser/prefs/pref_registry_syncable.h"

#include "chrome/browser/prefs/pref_service.h"

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/search_engines/prepopulated_engines.h"

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

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

-void RegisterUserPrefs(PrefServiceSyncable* prefs) {

- prefs->RegisterIntegerPref(prefs::kCountryIDAtInstall,

- kCountryIDUnknown,

- PrefServiceSyncable::UNSYNCABLE_PREF);

- prefs->RegisterListPref(prefs::kSearchProviderOverrides,

- PrefServiceSyncable::UNSYNCABLE_PREF);

- prefs->RegisterIntegerPref(prefs::kSearchProviderOverridesVersion,

- -1,

- PrefServiceSyncable::UNSYNCABLE_PREF);

+void RegisterUserPrefs(PrefRegistrySyncable* registry) {

+ registry->RegisterIntegerPref(prefs::kCountryIDAtInstall,

+ kCountryIDUnknown,

+ PrefRegistrySyncable::UNSYNCABLE_PREF);

+ registry->RegisterListPref(prefs::kSearchProviderOverrides,

+ PrefRegistrySyncable::UNSYNCABLE_PREF);

+ registry->RegisterIntegerPref(prefs::kSearchProviderOverridesVersion,

+ -1,

+ PrefRegistrySyncable::UNSYNCABLE_PREF);

// Obsolete pref, for migration.

- prefs->RegisterIntegerPref(prefs::kGeoIDAtInstall,

- -1,

- PrefServiceSyncable::UNSYNCABLE_PREF);

+ registry->RegisterIntegerPref(prefs::kGeoIDAtInstall,

+ -1,

+ PrefRegistrySyncable::UNSYNCABLE_PREF);

}

int GetDataVersion(PrefService* prefs) {