chrome/browser/managed_mode/managed_user_service.cc - Issue 12079097: Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable.

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_user_service.cc

Issue 12079097: Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Merge to head again; base::File changes conflicted. 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:

Index: chrome/browser/managed_mode/managed_user_service.cc

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

index 756c97da8592625d9f2693fd2bf111862cfc8bf3..045dc9a5c795fda56c9526589bd2ec8bf465662f 100644

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

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

@@ -9,6 +9,7 @@

#include "chrome/browser/extensions/extension_service.h"

#include "chrome/browser/extensions/extension_system.h"

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

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

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

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

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

@@ -98,14 +99,14 @@ bool ManagedUserService::ProfileIsManaged() const {

}

// static

-void ManagedUserService::RegisterUserPrefs(PrefServiceSyncable* prefs) {

- prefs->RegisterDictionaryPref(prefs::kManagedModeManualHosts,

- PrefServiceSyncable::UNSYNCABLE_PREF);

- prefs->RegisterDictionaryPref(prefs::kManagedModeManualURLs,

- PrefServiceSyncable::UNSYNCABLE_PREF);

- prefs->RegisterIntegerPref(prefs::kDefaultManagedModeFilteringBehavior,

- ManagedModeURLFilter::BLOCK,

- PrefServiceSyncable::UNSYNCABLE_PREF);

+void ManagedUserService::RegisterUserPrefs(PrefRegistrySyncable* registry) {

+ registry->RegisterDictionaryPref(prefs::kManagedModeManualHosts,

+ PrefRegistrySyncable::UNSYNCABLE_PREF);

+ registry->RegisterDictionaryPref(prefs::kManagedModeManualURLs,

+ PrefRegistrySyncable::UNSYNCABLE_PREF);

+ registry->RegisterIntegerPref(prefs::kDefaultManagedModeFilteringBehavior,

+ ManagedModeURLFilter::BLOCK,

+ PrefRegistrySyncable::UNSYNCABLE_PREF);

}

scoped_refptr<const ManagedModeURLFilter>