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

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

Issue 2148293004: [Sync] //components/sync external changes [DO NOT SUBMIT] (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@sc-1
Patch Set: Rebase. Created 4 years, 4 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
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 <stddef.h> 7 #include <stddef.h>
8 8
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 30 matching lines...) Expand all
41 #include "components/prefs/pref_notifier_impl.h" 41 #include "components/prefs/pref_notifier_impl.h"
42 #include "components/prefs/pref_registry.h" 42 #include "components/prefs/pref_registry.h"
43 #include "components/prefs/pref_registry_simple.h" 43 #include "components/prefs/pref_registry_simple.h"
44 #include "components/prefs/pref_service.h" 44 #include "components/prefs/pref_service.h"
45 #include "components/prefs/pref_store.h" 45 #include "components/prefs/pref_store.h"
46 #include "components/prefs/pref_value_store.h" 46 #include "components/prefs/pref_value_store.h"
47 #include "components/search_engines/default_search_manager.h" 47 #include "components/search_engines/default_search_manager.h"
48 #include "components/search_engines/default_search_pref_migration.h" 48 #include "components/search_engines/default_search_pref_migration.h"
49 #include "components/search_engines/search_engines_pref_names.h" 49 #include "components/search_engines/search_engines_pref_names.h"
50 #include "components/signin/core/common/signin_pref_names.h" 50 #include "components/signin/core/common/signin_pref_names.h"
51 #include "components/sync/base/model_type.h"
51 #include "components/sync_driver/pref_names.h" 52 #include "components/sync_driver/pref_names.h"
52 #include "components/syncable_prefs/pref_model_associator.h" 53 #include "components/syncable_prefs/pref_model_associator.h"
53 #include "components/syncable_prefs/pref_service_syncable.h" 54 #include "components/syncable_prefs/pref_service_syncable.h"
54 #include "components/syncable_prefs/pref_service_syncable_factory.h" 55 #include "components/syncable_prefs/pref_service_syncable_factory.h"
55 #include "components/user_prefs/tracked/pref_names.h" 56 #include "components/user_prefs/tracked/pref_names.h"
56 #include "content/public/browser/browser_context.h" 57 #include "content/public/browser/browser_context.h"
57 #include "content/public/browser/browser_thread.h" 58 #include "content/public/browser/browser_thread.h"
58 #include "grit/browser_resources.h" 59 #include "grit/browser_resources.h"
59 #include "sync/internal_api/public/base/model_type.h"
60 #include "ui/base/resource/resource_bundle.h" 60 #include "ui/base/resource/resource_bundle.h"
61 61
62 #if defined(ENABLE_EXTENSIONS) 62 #if defined(ENABLE_EXTENSIONS)
63 #include "extensions/browser/pref_names.h" 63 #include "extensions/browser/pref_names.h"
64 #endif 64 #endif
65 65
66 #if defined(ENABLE_SUPERVISED_USERS) 66 #if defined(ENABLE_SUPERVISED_USERS)
67 #include "chrome/browser/supervised_user/supervised_user_pref_store.h" 67 #include "chrome/browser/supervised_user/supervised_user_pref_store.h"
68 #endif 68 #endif
69 69
(...skipping 469 matching lines...) Expand 10 before | Expand all | Expand 10 after
539 539
540 void ClearResetTime(Profile* profile) { 540 void ClearResetTime(Profile* profile) {
541 ProfilePrefStoreManager::ClearResetTime(profile->GetPrefs()); 541 ProfilePrefStoreManager::ClearResetTime(profile->GetPrefs());
542 } 542 }
543 543
544 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { 544 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
545 ProfilePrefStoreManager::RegisterProfilePrefs(registry); 545 ProfilePrefStoreManager::RegisterProfilePrefs(registry);
546 } 546 }
547 547
548 } // namespace chrome_prefs 548 } // namespace chrome_prefs
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698