| 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 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 99 #include "chrome/browser/user_style_sheet_watcher_factory.h" | 99 #include "chrome/browser/user_style_sheet_watcher_factory.h" |
| 100 #include "chrome/browser/webdata/web_data_service_factory.h" | 100 #include "chrome/browser/webdata/web_data_service_factory.h" |
| 101 | 101 |
| 102 #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION) | 102 #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION) |
| 103 #include "chrome/browser/captive_portal/captive_portal_service_factory.h" | 103 #include "chrome/browser/captive_portal/captive_portal_service_factory.h" |
| 104 #endif | 104 #endif |
| 105 | 105 |
| 106 #if defined(ENABLE_CONFIGURATION_POLICY) | 106 #if defined(ENABLE_CONFIGURATION_POLICY) |
| 107 #include "chrome/browser/policy/cloud/user_cloud_policy_invalidator_factory.h" | 107 #include "chrome/browser/policy/cloud/user_cloud_policy_invalidator_factory.h" |
| 108 #if defined(OS_CHROMEOS) | 108 #if defined(OS_CHROMEOS) |
| 109 #include "chrome/browser/chromeos/policy/network_policy_service_factory.h" |
| 109 #include "chrome/browser/chromeos/policy/recommendation_restorer_factory.h" | 110 #include "chrome/browser/chromeos/policy/recommendation_restorer_factory.h" |
| 110 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chrom
eos.h" | 111 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chrom
eos.h" |
| 111 #include "chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder_facto
ry.h" | 112 #include "chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder_facto
ry.h" |
| 112 #else | 113 #else |
| 113 #include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h" | 114 #include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h" |
| 114 #include "chrome/browser/policy/cloud/user_policy_signin_service_factory.h" | 115 #include "chrome/browser/policy/cloud/user_policy_signin_service_factory.h" |
| 115 #endif | 116 #endif |
| 116 #endif | 117 #endif |
| 117 | 118 |
| 118 #if defined(ENABLE_MANAGED_USERS) | 119 #if defined(ENABLE_MANAGED_USERS) |
| (...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 294 PasswordStoreFactory::GetInstance(); | 295 PasswordStoreFactory::GetInstance(); |
| 295 #if !defined(OS_ANDROID) | 296 #if !defined(OS_ANDROID) |
| 296 PinnedTabServiceFactory::GetInstance(); | 297 PinnedTabServiceFactory::GetInstance(); |
| 297 #endif | 298 #endif |
| 298 #if defined(ENABLE_PLUGINS) | 299 #if defined(ENABLE_PLUGINS) |
| 299 PluginPrefsFactory::GetInstance(); | 300 PluginPrefsFactory::GetInstance(); |
| 300 #endif | 301 #endif |
| 301 policy::ProfilePolicyConnectorFactory::GetInstance(); | 302 policy::ProfilePolicyConnectorFactory::GetInstance(); |
| 302 #if defined(ENABLE_CONFIGURATION_POLICY) | 303 #if defined(ENABLE_CONFIGURATION_POLICY) |
| 303 #if defined(OS_CHROMEOS) | 304 #if defined(OS_CHROMEOS) |
| 305 policy::NetworkPolicyServiceFactory::GetInstance(); |
| 304 policy::RecommendationRestorerFactory::GetInstance(); | 306 policy::RecommendationRestorerFactory::GetInstance(); |
| 305 policy::UserCloudPolicyManagerFactoryChromeOS::GetInstance(); | 307 policy::UserCloudPolicyManagerFactoryChromeOS::GetInstance(); |
| 306 policy::UserCloudPolicyTokenForwarderFactory::GetInstance(); | 308 policy::UserCloudPolicyTokenForwarderFactory::GetInstance(); |
| 307 #else | 309 #else |
| 308 policy::UserCloudPolicyManagerFactory::GetInstance(); | 310 policy::UserCloudPolicyManagerFactory::GetInstance(); |
| 309 policy::UserPolicySigninServiceFactory::GetInstance(); | 311 policy::UserPolicySigninServiceFactory::GetInstance(); |
| 310 #endif | 312 #endif |
| 311 policy::UserCloudPolicyInvalidatorFactory::GetInstance(); | 313 policy::UserCloudPolicyInvalidatorFactory::GetInstance(); |
| 312 #endif | 314 #endif |
| 313 predictors::AutocompleteActionPredictorFactory::GetInstance(); | 315 predictors::AutocompleteActionPredictorFactory::GetInstance(); |
| (...skipping 22 matching lines...) Expand all Loading... |
| 336 TokenServiceFactory::GetInstance(); | 338 TokenServiceFactory::GetInstance(); |
| 337 #if !defined(OS_ANDROID) | 339 #if !defined(OS_ANDROID) |
| 338 UserStyleSheetWatcherFactory::GetInstance(); | 340 UserStyleSheetWatcherFactory::GetInstance(); |
| 339 #endif | 341 #endif |
| 340 WebDataServiceFactory::GetInstance(); | 342 WebDataServiceFactory::GetInstance(); |
| 341 } | 343 } |
| 342 | 344 |
| 343 void ChromeBrowserMainExtraPartsProfiles::PreProfileInit() { | 345 void ChromeBrowserMainExtraPartsProfiles::PreProfileInit() { |
| 344 EnsureBrowserContextKeyedServiceFactoriesBuilt(); | 346 EnsureBrowserContextKeyedServiceFactoriesBuilt(); |
| 345 } | 347 } |
| OLD | NEW |