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

Side by Side Diff: chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc

Issue 24153012: Fix cyclic dependency between ProfilePolicyConnector and PrefService. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Use callback_list in PolicyCertVerifier. Created 7 years, 2 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 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 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 #include "chrome/browser/extensions/token_cache/token_cache_service_factory.h" 104 #include "chrome/browser/extensions/token_cache/token_cache_service_factory.h"
105 #endif // defined(ENABLE_EXTENSIONS) 105 #endif // defined(ENABLE_EXTENSIONS)
106 106
107 #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION) 107 #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION)
108 #include "chrome/browser/captive_portal/captive_portal_service_factory.h" 108 #include "chrome/browser/captive_portal/captive_portal_service_factory.h"
109 #endif 109 #endif
110 110
111 #if defined(ENABLE_CONFIGURATION_POLICY) 111 #if defined(ENABLE_CONFIGURATION_POLICY)
112 #include "chrome/browser/policy/cloud/user_cloud_policy_invalidator_factory.h" 112 #include "chrome/browser/policy/cloud/user_cloud_policy_invalidator_factory.h"
113 #if defined(OS_CHROMEOS) 113 #if defined(OS_CHROMEOS)
114 #include "chrome/browser/chromeos/policy/network_policy_service_factory.h"
114 #include "chrome/browser/chromeos/policy/recommendation_restorer_factory.h" 115 #include "chrome/browser/chromeos/policy/recommendation_restorer_factory.h"
115 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chrom eos.h" 116 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chrom eos.h"
116 #include "chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder_facto ry.h" 117 #include "chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder_facto ry.h"
117 #else 118 #else
118 #include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h" 119 #include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h"
119 #include "chrome/browser/policy/cloud/user_policy_signin_service_factory.h" 120 #include "chrome/browser/policy/cloud/user_policy_signin_service_factory.h"
120 #endif 121 #endif
121 #endif 122 #endif
122 123
123 #if defined(ENABLE_MANAGED_USERS) 124 #if defined(ENABLE_MANAGED_USERS)
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
311 PasswordStoreFactory::GetInstance(); 312 PasswordStoreFactory::GetInstance();
312 #if !defined(OS_ANDROID) 313 #if !defined(OS_ANDROID)
313 PinnedTabServiceFactory::GetInstance(); 314 PinnedTabServiceFactory::GetInstance();
314 #endif 315 #endif
315 #if defined(ENABLE_PLUGINS) 316 #if defined(ENABLE_PLUGINS)
316 PluginPrefsFactory::GetInstance(); 317 PluginPrefsFactory::GetInstance();
317 #endif 318 #endif
318 policy::ProfilePolicyConnectorFactory::GetInstance(); 319 policy::ProfilePolicyConnectorFactory::GetInstance();
319 #if defined(ENABLE_CONFIGURATION_POLICY) 320 #if defined(ENABLE_CONFIGURATION_POLICY)
320 #if defined(OS_CHROMEOS) 321 #if defined(OS_CHROMEOS)
322 policy::NetworkPolicyServiceFactory::GetInstance();
321 policy::RecommendationRestorerFactory::GetInstance(); 323 policy::RecommendationRestorerFactory::GetInstance();
322 policy::UserCloudPolicyManagerFactoryChromeOS::GetInstance(); 324 policy::UserCloudPolicyManagerFactoryChromeOS::GetInstance();
323 policy::UserCloudPolicyTokenForwarderFactory::GetInstance(); 325 policy::UserCloudPolicyTokenForwarderFactory::GetInstance();
324 #else 326 #else
325 policy::UserCloudPolicyManagerFactory::GetInstance(); 327 policy::UserCloudPolicyManagerFactory::GetInstance();
326 policy::UserPolicySigninServiceFactory::GetInstance(); 328 policy::UserPolicySigninServiceFactory::GetInstance();
327 #endif 329 #endif
328 policy::UserCloudPolicyInvalidatorFactory::GetInstance(); 330 policy::UserCloudPolicyInvalidatorFactory::GetInstance();
329 #endif 331 #endif
330 predictors::AutocompleteActionPredictorFactory::GetInstance(); 332 predictors::AutocompleteActionPredictorFactory::GetInstance();
(...skipping 24 matching lines...) Expand all
355 TokenServiceFactory::GetInstance(); 357 TokenServiceFactory::GetInstance();
356 #if !defined(OS_ANDROID) 358 #if !defined(OS_ANDROID)
357 UserStyleSheetWatcherFactory::GetInstance(); 359 UserStyleSheetWatcherFactory::GetInstance();
358 #endif 360 #endif
359 WebDataServiceFactory::GetInstance(); 361 WebDataServiceFactory::GetInstance();
360 } 362 }
361 363
362 void ChromeBrowserMainExtraPartsProfiles::PreProfileInit() { 364 void ChromeBrowserMainExtraPartsProfiles::PreProfileInit() {
363 EnsureBrowserContextKeyedServiceFactoriesBuilt(); 365 EnsureBrowserContextKeyedServiceFactoriesBuilt();
364 } 366 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698