chrome/browser/managed_mode/managed_mode.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/managed_mode/managed_mode.cc

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

Patch Set: Address review comments. Fix Clang build and fix bug shown by trybots. 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

« no previous file with comments | « chrome/browser/managed_mode/managed_mode.h ('k') | chrome/browser/metrics/metrics_log.h » ('j') | chrome/browser/net/pref_proxy_config_tracker_impl_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/managed_mode/managed_mode.cc

diff --git a/chrome/browser/managed_mode/managed_mode.cc b/chrome/browser/managed_mode/managed_mode.cc

index 12ad663101ca445c1dab7e976b0a11e9f353d2d3..c95a10442b1e400f333d0e2949bf8c7c331b9000 100644

--- a/chrome/browser/managed_mode/managed_mode.cc

+++ b/chrome/browser/managed_mode/managed_mode.cc

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

#include "chrome/browser/browser_process.h"

#include "chrome/browser/managed_mode/managed_mode_site_list.h"

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

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

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

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

#include "chrome/browser/ui/browser.h"

@@ -32,8 +33,8 @@ ManagedMode* ManagedMode::GetInstance() {

}

// static

-void ManagedMode::RegisterPrefs(PrefServiceSimple* prefs) {

- prefs->RegisterBooleanPref(prefs::kInManagedMode, false);

+void ManagedMode::RegisterPrefs(PrefRegistrySimple* registry) {

+ registry->RegisterBooleanPref(prefs::kInManagedMode, false);

}

// static