chrome/browser/chromeos/login/wallpaper_manager.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/wallpaper_manager.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/wallpaper_manager.h ('k') | chrome/browser/chromeos/login/wizard_controller.h » ('j') | chrome/browser/external_protocol/external_protocol_handler.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/wallpaper_manager.cc

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

index daf7e0135e1ba599f99bec0b8778774f760081eb..3953b98119b29bee3e1f792f3786a31f96e50ce0 100644

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

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

@@ -8,9 +8,9 @@

#include "ash/shell.h"

#include "base/command_line.h"

-#include "base/logging.h"

#include "base/file_path.h"

#include "base/file_util.h"

+#include "base/logging.h"

#include "base/metrics/histogram.h"

#include "base/path_service.h"

#include "base/string_number_conversions.h"

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

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

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

#include "chrome/browser/chromeos/settings/cros_settings.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/chrome_notification_types.h"

@@ -139,7 +140,7 @@ void WallpaperManager::Shutdown() {

}

// static

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

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

local_state->RegisterDictionaryPref(prefs::kUsersWallpaperInfo);

local_state->RegisterDictionaryPref(kUserWallpapers);

local_state->RegisterDictionaryPref(kUserWallpapersProperties);