chrome/browser/first_run/first_run.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/first_run/first_run.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:

Index: chrome/browser/first_run/first_run.cc

diff --git a/chrome/browser/first_run/first_run.cc b/chrome/browser/first_run/first_run.cc

index 39eb69a4e2caed07e5d03f657a4d47c145101d50..3c06b3c7f9b3f0cf7d949e9fd0abc4d2b4caaa74 100644

--- a/chrome/browser/first_run/first_run.cc

+++ b/chrome/browser/first_run/first_run.cc

@@ -26,6 +26,7 @@

#include "chrome/browser/importer/importer_progress_dialog.h"

#include "chrome/browser/importer/importer_progress_observer.h"

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

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

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

#include "chrome/browser/process_singleton.h"

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

@@ -410,10 +411,10 @@ std::string GetPingDelayPrefName() {

installer::master_preferences::kDistroPingDelay);

}

-void RegisterUserPrefs(PrefServiceSyncable* prefs) {

- prefs->RegisterIntegerPref(GetPingDelayPrefName().c_str(),

- 0,

- PrefServiceSyncable::UNSYNCABLE_PREF);

+void RegisterUserPrefs(PrefRegistrySyncable* registry) {

+ registry->RegisterIntegerPref(GetPingDelayPrefName().c_str(),

+ 0,

+ PrefRegistrySyncable::UNSYNCABLE_PREF);

}

bool RemoveSentinel() {