chrome/browser/prefs/incognito_mode_prefs.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/prefs/incognito_mode_prefs.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/prefs/incognito_mode_prefs.cc

diff --git a/chrome/browser/prefs/incognito_mode_prefs.cc b/chrome/browser/prefs/incognito_mode_prefs.cc

index 958140b2ed46cb71dd280c632f94c3f789c92658..79ffcdc4e8aba504fd08101ba5752a630610e031 100644

--- a/chrome/browser/prefs/incognito_mode_prefs.cc

+++ b/chrome/browser/prefs/incognito_mode_prefs.cc

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

#include "base/command_line.h"

#include "base/logging.h"

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

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

#include "chrome/common/chrome_switches.h"

#include "chrome/common/pref_names.h"

@@ -52,11 +53,10 @@ void IncognitoModePrefs::SetAvailability(PrefService* prefs,

}

// static

-void IncognitoModePrefs::RegisterUserPrefs(PrefServiceSyncable* pref_service) {

- DCHECK(pref_service);

- pref_service->RegisterIntegerPref(prefs::kIncognitoModeAvailability,

- IncognitoModePrefs::ENABLED,

- PrefServiceSyncable::UNSYNCABLE_PREF);

+void IncognitoModePrefs::RegisterUserPrefs(PrefRegistrySyncable* registry) {

+ registry->RegisterIntegerPref(prefs::kIncognitoModeAvailability,

+ IncognitoModePrefs::ENABLED,

+ PrefRegistrySyncable::UNSYNCABLE_PREF);

}

// static