Chromium Code Reviews| 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 "apps/app_load_service_factory.h" | 7 #include "apps/app_load_service_factory.h" |
| 8 #include "apps/app_restore_service_factory.h" | 8 #include "apps/app_restore_service_factory.h" |
| 9 #include "apps/shell_window_geometry_cache.h" | 9 #include "apps/shell_window_geometry_cache.h" |
| 10 #include "chrome/browser/apps/shortcut_manager_factory.h" | 10 #include "chrome/browser/apps/shortcut_manager_factory.h" |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 70 #include "chrome/browser/extensions/api/feedback_private/feedback_private_api.h" | 70 #include "chrome/browser/extensions/api/feedback_private/feedback_private_api.h" |
| 71 #include "chrome/browser/extensions/api/font_settings/font_settings_api.h" | 71 #include "chrome/browser/extensions/api/font_settings/font_settings_api.h" |
| 72 #include "chrome/browser/extensions/api/history/history_api.h" | 72 #include "chrome/browser/extensions/api/history/history_api.h" |
| 73 #include "chrome/browser/extensions/api/identity/identity_api.h" | 73 #include "chrome/browser/extensions/api/identity/identity_api.h" |
| 74 #include "chrome/browser/extensions/api/idle/idle_manager_factory.h" | 74 #include "chrome/browser/extensions/api/idle/idle_manager_factory.h" |
| 75 #include "chrome/browser/extensions/api/input/input.h" | 75 #include "chrome/browser/extensions/api/input/input.h" |
| 76 #include "chrome/browser/extensions/api/location/location_manager.h" | 76 #include "chrome/browser/extensions/api/location/location_manager.h" |
| 77 #include "chrome/browser/extensions/api/management/management_api.h" | 77 #include "chrome/browser/extensions/api/management/management_api.h" |
| 78 #include "chrome/browser/extensions/api/mdns/mdns_api.h" | 78 #include "chrome/browser/extensions/api/mdns/mdns_api.h" |
| 79 #include "chrome/browser/extensions/api/media_galleries_private/media_galleries_ private_api.h" | 79 #include "chrome/browser/extensions/api/media_galleries_private/media_galleries_ private_api.h" |
| 80 #include "chrome/browser/extensions/api/networking_private/networking_private_ev ent_router_factory.h" | |
| 80 #include "chrome/browser/extensions/api/omnibox/omnibox_api.h" | 81 #include "chrome/browser/extensions/api/omnibox/omnibox_api.h" |
| 81 #include "chrome/browser/extensions/api/preference/chrome_direct_setting_api.h" | 82 #include "chrome/browser/extensions/api/preference/chrome_direct_setting_api.h" |
| 82 #include "chrome/browser/extensions/api/preference/preference_api.h" | 83 #include "chrome/browser/extensions/api/preference/preference_api.h" |
| 83 #include "chrome/browser/extensions/api/processes/processes_api.h" | 84 #include "chrome/browser/extensions/api/processes/processes_api.h" |
| 84 #include "chrome/browser/extensions/api/push_messaging/push_messaging_api.h" | 85 #include "chrome/browser/extensions/api/push_messaging/push_messaging_api.h" |
| 85 #include "chrome/browser/extensions/api/serial/serial_connection.h" | 86 #include "chrome/browser/extensions/api/serial/serial_connection.h" |
| 86 #include "chrome/browser/extensions/api/sessions/sessions_api.h" | 87 #include "chrome/browser/extensions/api/sessions/sessions_api.h" |
| 87 #include "chrome/browser/extensions/api/signed_in_devices/signed_in_devices_mana ger.h" | 88 #include "chrome/browser/extensions/api/signed_in_devices/signed_in_devices_mana ger.h" |
| 88 #include "chrome/browser/extensions/api/socket/socket.h" | 89 #include "chrome/browser/extensions/api/socket/socket.h" |
| 89 #include "chrome/browser/extensions/api/socket/tcp_socket.h" | 90 #include "chrome/browser/extensions/api/socket/tcp_socket.h" |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 122 | 123 |
| 123 #if defined(ENABLE_MANAGED_USERS) | 124 #if defined(ENABLE_MANAGED_USERS) |
| 124 #include "chrome/browser/managed_mode/managed_user_service_factory.h" | 125 #include "chrome/browser/managed_mode/managed_user_service_factory.h" |
| 125 #include "chrome/browser/managed_mode/managed_user_sync_service_factory.h" | 126 #include "chrome/browser/managed_mode/managed_user_sync_service_factory.h" |
| 126 #endif | 127 #endif |
| 127 | 128 |
| 128 #if defined(OS_CHROMEOS) | 129 #if defined(OS_CHROMEOS) |
| 129 #include "chrome/browser/chromeos/extensions/input_method_api.h" | 130 #include "chrome/browser/chromeos/extensions/input_method_api.h" |
| 130 #include "chrome/browser/chromeos/extensions/media_player_api.h" | 131 #include "chrome/browser/chromeos/extensions/media_player_api.h" |
| 131 #include "chrome/browser/extensions/api/input_ime/input_ime_api.h" | 132 #include "chrome/browser/extensions/api/input_ime/input_ime_api.h" |
| 132 #include "chrome/browser/extensions/api/networking_private/networking_private_ev ent_router_factory.h" | |
| 133 #if defined(FILE_MANAGER_EXTENSION) | 133 #if defined(FILE_MANAGER_EXTENSION) |
| 134 #include "chrome/browser/chromeos/extensions/file_manager/file_browser_private_a pi_factory.h" | 134 #include "chrome/browser/chromeos/extensions/file_manager/file_browser_private_a pi_factory.h" |
| 135 #endif | 135 #endif |
| 136 #endif | 136 #endif |
| 137 | 137 |
| 138 #if defined(USE_AURA) | 138 #if defined(USE_AURA) |
| 139 #include "chrome/browser/ui/gesture_prefs_observer_factory_aura.h" | 139 #include "chrome/browser/ui/gesture_prefs_observer_factory_aura.h" |
| 140 #endif | 140 #endif |
| 141 | 141 |
| 142 #if defined(OS_ANDROID) | 142 #if defined(OS_ANDROID) |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 192 BackgroundContentsServiceFactory::GetInstance(); | 192 BackgroundContentsServiceFactory::GetInstance(); |
| 193 #endif | 193 #endif |
| 194 BookmarkModelFactory::GetInstance(); | 194 BookmarkModelFactory::GetInstance(); |
| 195 #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION) | 195 #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION) |
| 196 captive_portal::CaptivePortalServiceFactory::GetInstance(); | 196 captive_portal::CaptivePortalServiceFactory::GetInstance(); |
| 197 #endif | 197 #endif |
| 198 ChromeGeolocationPermissionContextFactory::GetInstance(); | 198 ChromeGeolocationPermissionContextFactory::GetInstance(); |
| 199 #if defined(OS_ANDROID) | 199 #if defined(OS_ANDROID) |
| 200 ProtectedMediaIdentifierPermissionContextFactory::GetInstance(); | 200 ProtectedMediaIdentifierPermissionContextFactory::GetInstance(); |
| 201 #endif | 201 #endif |
| 202 #if defined(OS_CHROMEOS) | |
| 203 chromeos::NetworkingPrivateEventRouterFactory::GetInstance(); | |
| 204 #endif | |
| 205 #if defined(ENABLE_FULL_PRINTING) | 202 #if defined(ENABLE_FULL_PRINTING) |
| 206 CloudPrintProxyServiceFactory::GetInstance(); | 203 CloudPrintProxyServiceFactory::GetInstance(); |
| 207 #endif | 204 #endif |
| 208 CookieSettings::Factory::GetInstance(); | 205 CookieSettings::Factory::GetInstance(); |
| 209 #if defined(ENABLE_NOTIFICATIONS) | 206 #if defined(ENABLE_NOTIFICATIONS) |
| 210 DesktopNotificationServiceFactory::GetInstance(); | 207 DesktopNotificationServiceFactory::GetInstance(); |
| 211 #endif | 208 #endif |
| 212 DownloadServiceFactory::GetInstance(); | 209 DownloadServiceFactory::GetInstance(); |
| 213 #if defined(ENABLE_EXTENSIONS) | 210 #if defined(ENABLE_EXTENSIONS) |
| 214 AppShortcutManagerFactory::GetInstance(); | 211 AppShortcutManagerFactory::GetInstance(); |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 255 extensions::InputImeAPI::GetFactoryInstance(); | 252 extensions::InputImeAPI::GetFactoryInstance(); |
| 256 extensions::InputMethodAPI::GetFactoryInstance(); | 253 extensions::InputMethodAPI::GetFactoryInstance(); |
| 257 #endif | 254 #endif |
| 258 extensions::LocationManager::GetFactoryInstance(); | 255 extensions::LocationManager::GetFactoryInstance(); |
| 259 extensions::ManagementAPI::GetFactoryInstance(); | 256 extensions::ManagementAPI::GetFactoryInstance(); |
| 260 extensions::MDnsAPI::GetFactoryInstance(); | 257 extensions::MDnsAPI::GetFactoryInstance(); |
| 261 extensions::MediaGalleriesPrivateAPI::GetFactoryInstance(); | 258 extensions::MediaGalleriesPrivateAPI::GetFactoryInstance(); |
| 262 #if defined(OS_CHROMEOS) | 259 #if defined(OS_CHROMEOS) |
| 263 extensions::MediaPlayerAPI::GetFactoryInstance(); | 260 extensions::MediaPlayerAPI::GetFactoryInstance(); |
| 264 #endif | 261 #endif |
| 262 extensions::NetworkingPrivateEventRouterFactory::GetInstance(); | |
|
cbentzel
2013/10/16 12:51:36
Should this only be on if #ENABLE_EXTENSIONS is se
mef
2013/10/17 02:33:25
Done.
| |
| 265 extensions::OmniboxAPI::GetFactoryInstance(); | 263 extensions::OmniboxAPI::GetFactoryInstance(); |
| 266 #if defined(ENABLE_PLUGINS) | 264 #if defined(ENABLE_PLUGINS) |
| 267 extensions::PluginManager::GetFactoryInstance(); | 265 extensions::PluginManager::GetFactoryInstance(); |
| 268 #endif // defined(ENABLE_PLUGINS) | 266 #endif // defined(ENABLE_PLUGINS) |
| 269 extensions::PreferenceAPI::GetFactoryInstance(); | 267 extensions::PreferenceAPI::GetFactoryInstance(); |
| 270 extensions::ProcessesAPI::GetFactoryInstance(); | 268 extensions::ProcessesAPI::GetFactoryInstance(); |
| 271 extensions::PushMessagingAPI::GetFactoryInstance(); | 269 extensions::PushMessagingAPI::GetFactoryInstance(); |
| 272 extensions::SessionsAPI::GetFactoryInstance(); | 270 extensions::SessionsAPI::GetFactoryInstance(); |
| 273 extensions::SignedInDevicesManager::GetFactoryInstance(); | 271 extensions::SignedInDevicesManager::GetFactoryInstance(); |
| 274 #if defined(ENABLE_SPELLCHECK) | 272 #if defined(ENABLE_SPELLCHECK) |
| (...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 355 TokenServiceFactory::GetInstance(); | 353 TokenServiceFactory::GetInstance(); |
| 356 #if !defined(OS_ANDROID) | 354 #if !defined(OS_ANDROID) |
| 357 UserStyleSheetWatcherFactory::GetInstance(); | 355 UserStyleSheetWatcherFactory::GetInstance(); |
| 358 #endif | 356 #endif |
| 359 WebDataServiceFactory::GetInstance(); | 357 WebDataServiceFactory::GetInstance(); |
| 360 } | 358 } |
| 361 | 359 |
| 362 void ChromeBrowserMainExtraPartsProfiles::PreProfileInit() { | 360 void ChromeBrowserMainExtraPartsProfiles::PreProfileInit() { |
| 363 EnsureBrowserContextKeyedServiceFactoriesBuilt(); | 361 EnsureBrowserContextKeyedServiceFactoriesBuilt(); |
| 364 } | 362 } |
| OLD | NEW |