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

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

Issue 271793003: components: Extract pref_registry component out of user_prefs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 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 #include "chrome/browser/prefs/chrome_pref_service_factory.h" 5 #include "chrome/browser/prefs/chrome_pref_service_factory.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 21 matching lines...) Expand all
32 #include "chrome/browser/prefs/pref_service_syncable_factory.h" 32 #include "chrome/browser/prefs/pref_service_syncable_factory.h"
33 #include "chrome/browser/prefs/profile_pref_store_manager.h" 33 #include "chrome/browser/prefs/profile_pref_store_manager.h"
34 #include "chrome/browser/profiles/file_path_verifier_win.h" 34 #include "chrome/browser/profiles/file_path_verifier_win.h"
35 #include "chrome/browser/profiles/profile_info_cache.h" 35 #include "chrome/browser/profiles/profile_info_cache.h"
36 #include "chrome/browser/profiles/profile_manager.h" 36 #include "chrome/browser/profiles/profile_manager.h"
37 #include "chrome/browser/search_engines/default_search_manager.h" 37 #include "chrome/browser/search_engines/default_search_manager.h"
38 #include "chrome/browser/search_engines/default_search_pref_migration.h" 38 #include "chrome/browser/search_engines/default_search_pref_migration.h"
39 #include "chrome/browser/ui/profile_error_dialog.h" 39 #include "chrome/browser/ui/profile_error_dialog.h"
40 #include "chrome/common/chrome_constants.h" 40 #include "chrome/common/chrome_constants.h"
41 #include "chrome/common/pref_names.h" 41 #include "chrome/common/pref_names.h"
42 #include "components/user_prefs/pref_registry_syncable.h" 42 #include "components/pref_registry/pref_registry_syncable.h"
43 #include "content/public/browser/browser_context.h" 43 #include "content/public/browser/browser_context.h"
44 #include "content/public/browser/browser_thread.h" 44 #include "content/public/browser/browser_thread.h"
45 #include "extensions/browser/pref_names.h" 45 #include "extensions/browser/pref_names.h"
46 #include "grit/browser_resources.h" 46 #include "grit/browser_resources.h"
47 #include "grit/chromium_strings.h" 47 #include "grit/chromium_strings.h"
48 #include "grit/generated_resources.h" 48 #include "grit/generated_resources.h"
49 #include "ui/base/resource/resource_bundle.h" 49 #include "ui/base/resource/resource_bundle.h"
50 50
51 #if defined(ENABLE_CONFIGURATION_POLICY) 51 #if defined(ENABLE_CONFIGURATION_POLICY)
52 #include "components/policy/core/browser/browser_policy_connector.h" 52 #include "components/policy/core/browser/browser_policy_connector.h"
(...skipping 481 matching lines...) Expand 10 before | Expand all | Expand 10 after
534 534
535 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { 535 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
536 ProfilePrefStoreManager::RegisterProfilePrefs(registry); 536 ProfilePrefStoreManager::RegisterProfilePrefs(registry);
537 } 537 }
538 538
539 void RegisterPrefs(PrefRegistrySimple* registry) { 539 void RegisterPrefs(PrefRegistrySimple* registry) {
540 ProfilePrefStoreManager::RegisterPrefs(registry); 540 ProfilePrefStoreManager::RegisterPrefs(registry);
541 } 541 }
542 542
543 } // namespace chrome_prefs 543 } // namespace chrome_prefs
OLDNEW
« no previous file with comments | « chrome/browser/prefs/browser_prefs.cc ('k') | chrome/browser/prefs/chrome_pref_service_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698