Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2138)

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: 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
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..4776b0427097295910ab098ed7742582f3c72c94 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,11 +153,11 @@ DeviceStatusCollector::~DeviceStatusCollector() {
}
// static
-void DeviceStatusCollector::RegisterPrefs(PrefServiceSimple* local_state) {
- local_state->RegisterDictionaryPref(prefs::kDeviceActivityTimes,
- new base::DictionaryValue);
- local_state->RegisterDictionaryPref(prefs::kDeviceLocation,
- new base::DictionaryValue);
+void DeviceStatusCollector::RegisterPrefs(PrefRegistrySimple* registry) {
+ registry->RegisterDictionaryPref(prefs::kDeviceActivityTimes,
+ new base::DictionaryValue);
+ registry->RegisterDictionaryPref(prefs::kDeviceLocation,
+ new base::DictionaryValue);
}
void DeviceStatusCollector::CheckIdleState() {
« no previous file with comments | « chrome/browser/policy/device_status_collector.h ('k') | chrome/browser/policy/device_status_collector_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698