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

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

Issue 14622003: components: Move PrefRegistrySyncable into user_prefs namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixes Created 7 years, 7 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 9
10 namespace base { 10 namespace base {
11 class FilePath; 11 class FilePath;
12 class SequencedTaskRunner; 12 class SequencedTaskRunner;
13 } 13 }
14 14
15 namespace policy { 15 namespace policy {
16 class PolicyService; 16 class PolicyService;
17 } 17 }
18 18
19 class PrefRegistry; 19 class PrefRegistry;
20 class PrefRegistrySyncable;
21 class PrefService; 20 class PrefService;
22 class PrefServiceSyncable; 21 class PrefServiceSyncable;
23 class PrefStore; 22 class PrefStore;
24 23
24 namespace user_prefs {
25 class PrefRegistrySyncable;
26 }
27
25 namespace chrome_prefs { 28 namespace chrome_prefs {
26 29
27 // Factory methods that create and initialize a new instance of a 30 // Factory methods that create and initialize a new instance of a
28 // PrefService for Chrome with the applicable PrefStores. The 31 // PrefService for Chrome with the applicable PrefStores. The
29 // |pref_filename| points to the user preference file. This is the 32 // |pref_filename| points to the user preference file. This is the
30 // usual way to create a new PrefService. 33 // usual way to create a new PrefService.
31 // |extension_pref_store| is used as the source for extension-controlled 34 // |extension_pref_store| is used as the source for extension-controlled
32 // preferences and may be NULL. 35 // preferences and may be NULL.
33 // |policy_service| is used as the source for mandatory or recommended 36 // |policy_service| is used as the source for mandatory or recommended
34 // policies. 37 // policies.
(...skipping 10 matching lines...) Expand all
45 policy::PolicyService* policy_service, 48 policy::PolicyService* policy_service,
46 const scoped_refptr<PrefStore>& extension_prefs, 49 const scoped_refptr<PrefStore>& extension_prefs,
47 const scoped_refptr<PrefRegistry>& pref_registry, 50 const scoped_refptr<PrefRegistry>& pref_registry,
48 bool async); 51 bool async);
49 52
50 PrefServiceSyncable* CreateProfilePrefs( 53 PrefServiceSyncable* CreateProfilePrefs(
51 const base::FilePath& pref_filename, 54 const base::FilePath& pref_filename,
52 base::SequencedTaskRunner* pref_io_task_runner, 55 base::SequencedTaskRunner* pref_io_task_runner,
53 policy::PolicyService* policy_service, 56 policy::PolicyService* policy_service,
54 const scoped_refptr<PrefStore>& extension_prefs, 57 const scoped_refptr<PrefStore>& extension_prefs,
55 const scoped_refptr<PrefRegistrySyncable>& pref_registry, 58 const scoped_refptr<user_prefs::PrefRegistrySyncable>& pref_registry,
56 bool async); 59 bool async);
57 60
58 } // namespace chrome_prefs 61 } // namespace chrome_prefs
59 62
60 #endif // CHROME_BROWSER_PREFS_CHROME_PREF_SERVICE_FACTORY_H_ 63 #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