| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/profiles/chrome_browser_main_extra_parts_profiles.h" | 5 #include "chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.h" |
| 6 | 6 |
| 7 #include "chrome/browser/autocomplete/shortcuts_backend_factory.h" | 7 #include "chrome/browser/autocomplete/shortcuts_backend_factory.h" |
| 8 #include "chrome/browser/autofill/personal_data_manager_factory.h" | 8 #include "chrome/browser/autofill/personal_data_manager_factory.h" |
| 9 #include "chrome/browser/background/background_contents_service_factory.h" | 9 #include "chrome/browser/background/background_contents_service_factory.h" |
| 10 #include "chrome/browser/bookmarks/bookmark_model_factory.h" | 10 #include "chrome/browser/bookmarks/bookmark_model_factory.h" |
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 98 #endif | 98 #endif |
| 99 #endif | 99 #endif |
| 100 | 100 |
| 101 #if defined(USE_AURA) | 101 #if defined(USE_AURA) |
| 102 #include "chrome/browser/ui/gesture_prefs_observer_factory_aura.h" | 102 #include "chrome/browser/ui/gesture_prefs_observer_factory_aura.h" |
| 103 #endif | 103 #endif |
| 104 | 104 |
| 105 #if defined(OS_ANDROID) | 105 #if defined(OS_ANDROID) |
| 106 #include "chrome/browser/media/protected_media_identifier_permission_context_fac
tory.h" | 106 #include "chrome/browser/media/protected_media_identifier_permission_context_fac
tory.h" |
| 107 #else | 107 #else |
| 108 #include "chrome/browser/notifications/sync_notifier/chrome_notifier_service_fac
tory.h" | |
| 109 #include "chrome/browser/profile_resetter/automatic_profile_resetter_factory.h" | 108 #include "chrome/browser/profile_resetter/automatic_profile_resetter_factory.h" |
| 110 #endif | 109 #endif |
| 111 | 110 |
| 112 #if defined(ENABLE_SPELLCHECK) | 111 #if defined(ENABLE_SPELLCHECK) |
| 113 #include "chrome/browser/spellchecker/spellcheck_factory.h" | 112 #include "chrome/browser/spellchecker/spellcheck_factory.h" |
| 114 #endif | 113 #endif |
| 115 | 114 |
| 116 #if defined(ENABLE_SERVICE_DISCOVERY) | 115 #if defined(ENABLE_SERVICE_DISCOVERY) |
| 117 #include "chrome/browser/local_discovery/privet_notifications_factory.h" | 116 #include "chrome/browser/local_discovery/privet_notifications_factory.h" |
| 118 #endif | 117 #endif |
| (...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 216 #if defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_MACOSX) | 215 #if defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_MACOSX) |
| 217 scoped_ptr<extensions::NetworkingPrivateVerifyDelegateFactoryImpl> | 216 scoped_ptr<extensions::NetworkingPrivateVerifyDelegateFactoryImpl> |
| 218 networking_private_verify_delegate_factory( | 217 networking_private_verify_delegate_factory( |
| 219 new extensions::NetworkingPrivateVerifyDelegateFactoryImpl); | 218 new extensions::NetworkingPrivateVerifyDelegateFactoryImpl); |
| 220 extensions::NetworkingPrivateDelegateFactory::GetInstance() | 219 extensions::NetworkingPrivateDelegateFactory::GetInstance() |
| 221 ->SetVerifyDelegateFactory( | 220 ->SetVerifyDelegateFactory( |
| 222 networking_private_verify_delegate_factory.Pass()); | 221 networking_private_verify_delegate_factory.Pass()); |
| 223 #endif | 222 #endif |
| 224 #if !defined(OS_ANDROID) | 223 #if !defined(OS_ANDROID) |
| 225 MediaGalleriesPreferencesFactory::GetInstance(); | 224 MediaGalleriesPreferencesFactory::GetInstance(); |
| 226 notifier::ChromeNotifierServiceFactory::GetInstance(); | |
| 227 NTPResourceCacheFactory::GetInstance(); | 225 NTPResourceCacheFactory::GetInstance(); |
| 228 #endif | 226 #endif |
| 229 PasswordStoreFactory::GetInstance(); | 227 PasswordStoreFactory::GetInstance(); |
| 230 #if !defined(OS_ANDROID) | 228 #if !defined(OS_ANDROID) |
| 231 PinnedTabServiceFactory::GetInstance(); | 229 PinnedTabServiceFactory::GetInstance(); |
| 232 #endif | 230 #endif |
| 233 #if defined(ENABLE_PLUGINS) | 231 #if defined(ENABLE_PLUGINS) |
| 234 PluginPrefsFactory::GetInstance(); | 232 PluginPrefsFactory::GetInstance(); |
| 235 #endif | 233 #endif |
| 236 policy::ProfilePolicyConnectorFactory::GetInstance(); | 234 policy::ProfilePolicyConnectorFactory::GetInstance(); |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 276 TemplateURLServiceFactory::GetInstance(); | 274 TemplateURLServiceFactory::GetInstance(); |
| 277 #if defined(ENABLE_THEMES) | 275 #if defined(ENABLE_THEMES) |
| 278 ThemeServiceFactory::GetInstance(); | 276 ThemeServiceFactory::GetInstance(); |
| 279 #endif | 277 #endif |
| 280 WebDataServiceFactory::GetInstance(); | 278 WebDataServiceFactory::GetInstance(); |
| 281 } | 279 } |
| 282 | 280 |
| 283 void ChromeBrowserMainExtraPartsProfiles::PreProfileInit() { | 281 void ChromeBrowserMainExtraPartsProfiles::PreProfileInit() { |
| 284 EnsureBrowserContextKeyedServiceFactoriesBuilt(); | 282 EnsureBrowserContextKeyedServiceFactoriesBuilt(); |
| 285 } | 283 } |
| OLD | NEW |