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

Side by Side Diff: chrome/browser/prefs/chrome_pref_service_factory.h

Issue 335833003: Rename "managed (mode|user)" to "supervised user" (part 2) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review comments (+ a few other cleanups) Created 6 years, 6 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_PREFS_CHROME_PREF_SERVICE_FACTORY_H_ 5 #ifndef CHROME_BROWSER_PREFS_CHROME_PREF_SERVICE_FACTORY_H_
6 #define CHROME_BROWSER_PREFS_CHROME_PREF_SERVICE_FACTORY_H_ 6 #define CHROME_BROWSER_PREFS_CHROME_PREF_SERVICE_FACTORY_H_
7 7
8 #include "base/memory/ref_counted.h" 8 #include "base/memory/ref_counted.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 10
11 namespace base { 11 namespace base {
12 class DictionaryValue; 12 class DictionaryValue;
13 class FilePath; 13 class FilePath;
14 class SequencedTaskRunner; 14 class SequencedTaskRunner;
15 class Time; 15 class Time;
16 } 16 }
17 17
18 namespace policy { 18 namespace policy {
19 class PolicyService; 19 class PolicyService;
20 } 20 }
21 21
22 namespace user_prefs { 22 namespace user_prefs {
23 class PrefRegistrySyncable; 23 class PrefRegistrySyncable;
24 } 24 }
25 25
26 class ManagedUserSettingsService;
27 class PrefHashStore; 26 class PrefHashStore;
28 class PrefRegistry; 27 class PrefRegistry;
29 class PrefRegistrySimple; 28 class PrefRegistrySimple;
30 class PrefService; 29 class PrefService;
31 class PrefServiceSyncable; 30 class PrefServiceSyncable;
32 class PrefStore; 31 class PrefStore;
33 class Profile; 32 class Profile;
33 class SupervisedUserSettingsService;
34 class TrackedPreferenceValidationDelegate; 34 class TrackedPreferenceValidationDelegate;
35 35
36 namespace chrome_prefs { 36 namespace chrome_prefs {
37 37
38 namespace internals { 38 namespace internals {
39 39
40 extern const char kSettingsEnforcementTrialName[]; 40 extern const char kSettingsEnforcementTrialName[];
41 extern const char kSettingsEnforcementGroupNoEnforcement[]; 41 extern const char kSettingsEnforcementGroupNoEnforcement[];
42 extern const char kSettingsEnforcementGroupEnforceAlways[]; 42 extern const char kSettingsEnforcementGroupEnforceAlways[];
43 extern const char kSettingsEnforcementGroupEnforceAlwaysWithExtensions[]; 43 extern const char kSettingsEnforcementGroupEnforceAlwaysWithExtensions[];
(...skipping 21 matching lines...) Expand all
65 base::SequencedTaskRunner* pref_io_task_runner, 65 base::SequencedTaskRunner* pref_io_task_runner,
66 policy::PolicyService* policy_service, 66 policy::PolicyService* policy_service,
67 const scoped_refptr<PrefRegistry>& pref_registry, 67 const scoped_refptr<PrefRegistry>& pref_registry,
68 bool async); 68 bool async);
69 69
70 scoped_ptr<PrefServiceSyncable> CreateProfilePrefs( 70 scoped_ptr<PrefServiceSyncable> CreateProfilePrefs(
71 const base::FilePath& pref_filename, 71 const base::FilePath& pref_filename,
72 base::SequencedTaskRunner* pref_io_task_runner, 72 base::SequencedTaskRunner* pref_io_task_runner,
73 TrackedPreferenceValidationDelegate* validation_delegate, 73 TrackedPreferenceValidationDelegate* validation_delegate,
74 policy::PolicyService* policy_service, 74 policy::PolicyService* policy_service,
75 ManagedUserSettingsService* managed_user_settings, 75 SupervisedUserSettingsService* supervised_user_settings,
76 const scoped_refptr<PrefStore>& extension_prefs, 76 const scoped_refptr<PrefStore>& extension_prefs,
77 const scoped_refptr<user_prefs::PrefRegistrySyncable>& pref_registry, 77 const scoped_refptr<user_prefs::PrefRegistrySyncable>& pref_registry,
78 bool async); 78 bool async);
79 79
80 // Schedules verification of the path resolution of the preferences file under 80 // Schedules verification of the path resolution of the preferences file under
81 // |profile_path|. 81 // |profile_path|.
82 void SchedulePrefsFilePathVerification(const base::FilePath& profile_path); 82 void SchedulePrefsFilePathVerification(const base::FilePath& profile_path);
83 83
84 // Call before startup tasks kick in to disable delays in 84 // Call before startup tasks kick in to disable delays in
85 // chrome_prefs::Schedule*() methods and ignore presence of a domain when 85 // chrome_prefs::Schedule*() methods and ignore presence of a domain when
(...skipping 22 matching lines...) Expand all
108 108
109 // Register local state prefs used by chrome preference system. 109 // Register local state prefs used by chrome preference system.
110 void RegisterPrefs(PrefRegistrySimple* registry); 110 void RegisterPrefs(PrefRegistrySimple* registry);
111 111
112 // Register user prefs used by chrome preference system. 112 // Register user prefs used by chrome preference system.
113 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry); 113 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry);
114 114
115 } // namespace chrome_prefs 115 } // namespace chrome_prefs
116 116
117 #endif // CHROME_BROWSER_PREFS_CHROME_PREF_SERVICE_FACTORY_H_ 117 #endif // CHROME_BROWSER_PREFS_CHROME_PREF_SERVICE_FACTORY_H_
OLDNEW
« no previous file with comments | « chrome/browser/prefs/browser_prefs.cc ('k') | chrome/browser/prefs/chrome_pref_service_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698