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

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: Addressed comments. Created 7 years, 1 month 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 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 #include "chrome/browser/extensions/token_cache/token_cache_service_factory.h" 106 #include "chrome/browser/extensions/token_cache/token_cache_service_factory.h"
107 #endif // defined(ENABLE_EXTENSIONS) 107 #endif // defined(ENABLE_EXTENSIONS)
108 108
109 #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION) 109 #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION)
110 #include "chrome/browser/captive_portal/captive_portal_service_factory.h" 110 #include "chrome/browser/captive_portal/captive_portal_service_factory.h"
111 #endif 111 #endif
112 112
113 #if defined(ENABLE_CONFIGURATION_POLICY) 113 #if defined(ENABLE_CONFIGURATION_POLICY)
114 #include "chrome/browser/policy/cloud/user_cloud_policy_invalidator_factory.h" 114 #include "chrome/browser/policy/cloud/user_cloud_policy_invalidator_factory.h"
115 #if defined(OS_CHROMEOS) 115 #if defined(OS_CHROMEOS)
116 #include "chrome/browser/chromeos/policy/network_policy_service_factory.h"
116 #include "chrome/browser/chromeos/policy/recommendation_restorer_factory.h" 117 #include "chrome/browser/chromeos/policy/recommendation_restorer_factory.h"
117 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chrom eos.h" 118 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chrom eos.h"
118 #include "chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder_facto ry.h" 119 #include "chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder_facto ry.h"
119 #else 120 #else
120 #include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h" 121 #include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h"
121 #include "chrome/browser/policy/cloud/user_policy_signin_service_factory.h" 122 #include "chrome/browser/policy/cloud/user_policy_signin_service_factory.h"
122 #endif 123 #endif
123 #endif 124 #endif
124 125
125 #if defined(ENABLE_MANAGED_USERS) 126 #if defined(ENABLE_MANAGED_USERS)
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
317 PasswordStoreFactory::GetInstance(); 318 PasswordStoreFactory::GetInstance();
318 #if !defined(OS_ANDROID) 319 #if !defined(OS_ANDROID)
319 PinnedTabServiceFactory::GetInstance(); 320 PinnedTabServiceFactory::GetInstance();
320 #endif 321 #endif
321 #if defined(ENABLE_PLUGINS) 322 #if defined(ENABLE_PLUGINS)
322 PluginPrefsFactory::GetInstance(); 323 PluginPrefsFactory::GetInstance();
323 #endif 324 #endif
324 policy::ProfilePolicyConnectorFactory::GetInstance(); 325 policy::ProfilePolicyConnectorFactory::GetInstance();
325 #if defined(ENABLE_CONFIGURATION_POLICY) 326 #if defined(ENABLE_CONFIGURATION_POLICY)
326 #if defined(OS_CHROMEOS) 327 #if defined(OS_CHROMEOS)
328 policy::NetworkPolicyServiceFactory::GetInstance();
327 policy::RecommendationRestorerFactory::GetInstance(); 329 policy::RecommendationRestorerFactory::GetInstance();
328 policy::UserCloudPolicyManagerFactoryChromeOS::GetInstance(); 330 policy::UserCloudPolicyManagerFactoryChromeOS::GetInstance();
329 policy::UserCloudPolicyTokenForwarderFactory::GetInstance(); 331 policy::UserCloudPolicyTokenForwarderFactory::GetInstance();
330 #else 332 #else
331 policy::UserCloudPolicyManagerFactory::GetInstance(); 333 policy::UserCloudPolicyManagerFactory::GetInstance();
332 policy::UserPolicySigninServiceFactory::GetInstance(); 334 policy::UserPolicySigninServiceFactory::GetInstance();
333 #endif 335 #endif
334 policy::UserCloudPolicyInvalidatorFactory::GetInstance(); 336 policy::UserCloudPolicyInvalidatorFactory::GetInstance();
335 #endif 337 #endif
336 predictors::AutocompleteActionPredictorFactory::GetInstance(); 338 predictors::AutocompleteActionPredictorFactory::GetInstance();
(...skipping 24 matching lines...) Expand all
361 TokenServiceFactory::GetInstance(); 363 TokenServiceFactory::GetInstance();
362 #if !defined(OS_ANDROID) 364 #if !defined(OS_ANDROID)
363 UserStyleSheetWatcherFactory::GetInstance(); 365 UserStyleSheetWatcherFactory::GetInstance();
364 #endif 366 #endif
365 WebDataServiceFactory::GetInstance(); 367 WebDataServiceFactory::GetInstance();
366 } 368 }
367 369
368 void ChromeBrowserMainExtraPartsProfiles::PreProfileInit() { 370 void ChromeBrowserMainExtraPartsProfiles::PreProfileInit() {
369 EnsureBrowserContextKeyedServiceFactoriesBuilt(); 371 EnsureBrowserContextKeyedServiceFactoriesBuilt();
370 } 372 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698