chrome/browser/chromeos/settings/device_settings_cache.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/settings/device_settings_cache.cc

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

Patch Set: Fix double registration in Chrome Frame test. 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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/chromeos/settings/device_settings_cache.h ('k') | chrome/browser/chromeos/status/data_promo_notification.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/settings/device_settings_cache.cc

diff --git a/chrome/browser/chromeos/settings/device_settings_cache.cc b/chrome/browser/chromeos/settings/device_settings_cache.cc

index d8c57399bf12ae879b0993ad548cbf8a4c2e9868..a9bf424fbd62caa192fb44a1c728a25381a8588d 100644

--- a/chrome/browser/chromeos/settings/device_settings_cache.cc

+++ b/chrome/browser/chromeos/settings/device_settings_cache.cc

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

#include "base/bind.h"

#include "chrome/browser/chromeos/settings/cros_settings.h"

#include "chrome/browser/policy/proto/device_management_backend.pb.h"

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

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

#include "chrome/common/pref_names.h"

@@ -19,8 +20,8 @@ namespace chromeos {

namespace device_settings_cache {

-void RegisterPrefs(PrefServiceSimple* local_state) {

- local_state->RegisterStringPref(prefs::kDeviceSettingsCache, "invalid");

+void RegisterPrefs(PrefRegistrySimple* registry) {

+ registry->RegisterStringPref(prefs::kDeviceSettingsCache, "invalid");

}

bool Store(const em::PolicyData& policy, PrefService* local_state) {