chrome/browser/policy/browser_policy_connector.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/browser_policy_connector.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/browser_policy_connector.h ('k') | chrome/browser/policy/cloud_policy_core_unittest.cc » ('j') | chrome/browser/prefs/browser_prefs.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/policy/browser_policy_connector.cc

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

index 5132383c0b51b850e18d45d0f18a3e3cd3ba109c..26191f3bc89f0f17dd32e03c1bb1417130c1f124 100644

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

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

@@ -21,8 +21,8 @@

#include "chrome/browser/policy/managed_mode_policy_provider.h"

#include "chrome/browser/policy/policy_service_impl.h"

#include "chrome/browser/policy/policy_statistics_collector.h"

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

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

-#include "chrome/browser/prefs/pref_service_simple.h"

#include "chrome/browser/profiles/profile.h"

#include "chrome/common/chrome_paths.h"

#include "chrome/common/chrome_switches.h"

@@ -400,7 +400,7 @@ bool BrowserPolicyConnector::IsNonEnterpriseUser(const std::string& username) {

}

// static

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

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

local_state->RegisterIntegerPref(prefs::kUserPolicyRefreshRate,

kDefaultPolicyRefreshRateMs);

#if defined(OS_CHROMEOS)