chrome/browser/chromeos/login/user_manager_impl.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/login/user_manager_impl.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/login/user_manager.h ('k') | chrome/browser/chromeos/login/user_manager_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/login/user_manager_impl.cc

diff --git a/chrome/browser/chromeos/login/user_manager_impl.cc b/chrome/browser/chromeos/login/user_manager_impl.cc

index 772728461ec782b4c10de69f136b1d3b41ee38cb..9767c5a7dbe2edf28cbac52deb3d0f97f8fcab7b 100644

--- a/chrome/browser/chromeos/login/user_manager_impl.cc

+++ b/chrome/browser/chromeos/login/user_manager_impl.cc

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

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

#include "chrome/browser/chromeos/power/session_length_limiter.h"

#include "chrome/browser/policy/browser_policy_connector.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/browser/profiles/profile_manager.h"

@@ -158,7 +159,7 @@ bool ParseUserList(const ListValue& users_list,

} // namespace

// static

-void UserManager::RegisterPrefs(PrefServiceSimple* local_state) {

+void UserManager::RegisterPrefs(PrefRegistrySimple* local_state) {

local_state->RegisterListPref(kRegularUsers);

local_state->RegisterListPref(kPublicAccounts);

local_state->RegisterListPref(kLocallyManagedUsersFirstRun);