chrome/browser/policy/device_status_collector.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/policy/device_status_collector.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/notifications/notification_prefs_manager.cc ('K') | « chrome/browser/policy/device_status_collector.h ('k') | chrome/browser/policy/device_status_collector_browsertest.cc » ('j') | chrome/browser/prefs/browser_prefs.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/policy/device_status_collector.cc

diff --git a/chrome/browser/policy/device_status_collector.cc b/chrome/browser/policy/device_status_collector.cc

index 1917d0741dc0477c95350c1a944b5ee98194c713..c33ec9bfd5c547777526fe75f7a5ec63744c0e33 100644

--- a/chrome/browser/policy/device_status_collector.cc

+++ b/chrome/browser/policy/device_status_collector.cc

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

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

#include "chrome/browser/chromeos/system/statistics_provider.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/browser/prefs/scoped_user_pref_update.h"

#include "chrome/common/chrome_notification_types.h"

@@ -152,7 +153,7 @@ DeviceStatusCollector::~DeviceStatusCollector() {

}

// static

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

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

local_state->RegisterDictionaryPref(prefs::kDeviceActivityTimes,

new base::DictionaryValue);

local_state->RegisterDictionaryPref(prefs::kDeviceLocation,