chrome/browser/prefs/pref_service.h - Issue 6312121: Add initial device policy infrastructure.

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/prefs/pref_service.h

Issue 6312121: Add initial device policy infrastructure. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix race condition and tests. Created 9 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:

Index: chrome/browser/prefs/pref_service.h

diff --git a/chrome/browser/prefs/pref_service.h b/chrome/browser/prefs/pref_service.h

index a7b64d21776c46c39de0ed0ec454275b8dbbb5c7..0688edb7171272ceae248c5f53ff467350970a8d 100644

--- a/chrome/browser/prefs/pref_service.h

+++ b/chrome/browser/prefs/pref_service.h

@@ -231,11 +231,12 @@ class PrefService : public base::NonThreadSafe {

// PrefStore pointers. This constructor is what CreatePrefService() ends up

// calling. It's also used for unit tests.

PrefService(PrefStore* managed_platform_prefs,

- PrefStore* device_management_prefs,

+ PrefStore* managed_cloud_prefs,

PrefStore* extension_prefs,

PrefStore* command_line_prefs,

PersistentPrefStore* user_prefs,

- PrefStore* recommended_prefs,

+ PrefStore* recommended_platform_prefs,

+ PrefStore* recommended_cloud_prefs,

DefaultPrefStore* default_store);

// The PrefNotifier handles registering and notifying preference observers.

« no previous file with comments | « chrome/browser/prefs/pref_member.h ('k') | chrome/browser/prefs/pref_service.cc » ('j') | no next file with comments »