chrome/browser/chromeos/display/display_preferences.cc - Issue 11741003: Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple.

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/chromeos/display/display_preferences.cc

Issue 11741003: Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Respond to review comments. Created 7 years, 11 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

« chrome/browser/chromeos/audio/audio_handler.cc ('K') | « chrome/browser/chromeos/display/display_preferences.h ('k') | chrome/browser/chromeos/display/display_preferences_unittest.cc » ('j') | chrome/browser/external_protocol/external_protocol_handler.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/display/display_preferences.cc

diff --git a/chrome/browser/chromeos/display/display_preferences.cc b/chrome/browser/chromeos/display/display_preferences.cc

index 90d720471951c75889a062fae84ff0968cae36eb..41b4bc4f4d6d5e0e3242fa84d6376ac5b00b7489 100644

--- a/chrome/browser/chromeos/display/display_preferences.cc

+++ b/chrome/browser/chromeos/display/display_preferences.cc

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

#include "base/values.h"

#include "chrome/browser/browser_process.h"

#include "chrome/browser/chromeos/login/user_manager.h"

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

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

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

#include "chrome/common/pref_names.h"

@@ -132,7 +133,7 @@ void NotifyDisplayOverscans() {

} // namespace

-void RegisterDisplayLocalStatePrefs(PrefServiceSimple* local_state) {

+void RegisterDisplayLocalStatePrefs(PrefRegistrySimple* local_state) {

// The default secondary display layout.

local_state->RegisterIntegerPref(prefs::kSecondaryDisplayLayout,

static_cast<int>(ash::DisplayLayout::RIGHT));