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

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: Fix/Extend NetworkConfigurationUpdater unit test. 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_keep_alive_service_factory.h" 7 #include "apps/app_keep_alive_service_factory.h"
8 #include "apps/app_load_service_factory.h" 8 #include "apps/app_load_service_factory.h"
9 #include "apps/app_restore_service_factory.h" 9 #include "apps/app_restore_service_factory.h"
10 #include "apps/shell_window_geometry_cache.h" 10 #include "apps/shell_window_geometry_cache.h"
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 #include "chrome/browser/extensions/token_cache/token_cache_service_factory.h" 109 #include "chrome/browser/extensions/token_cache/token_cache_service_factory.h"
110 #endif // defined(ENABLE_EXTENSIONS) 110 #endif // defined(ENABLE_EXTENSIONS)
111 111
112 #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION) 112 #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION)
113 #include "chrome/browser/captive_portal/captive_portal_service_factory.h" 113 #include "chrome/browser/captive_portal/captive_portal_service_factory.h"
114 #endif 114 #endif
115 115
116 #if defined(ENABLE_CONFIGURATION_POLICY) 116 #if defined(ENABLE_CONFIGURATION_POLICY)
117 #include "chrome/browser/policy/cloud/user_cloud_policy_invalidator_factory.h" 117 #include "chrome/browser/policy/cloud/user_cloud_policy_invalidator_factory.h"
118 #if defined(OS_CHROMEOS) 118 #if defined(OS_CHROMEOS)
119 #include "chrome/browser/chromeos/policy/network_policy_service_factory.h"
119 #include "chrome/browser/chromeos/policy/recommendation_restorer_factory.h" 120 #include "chrome/browser/chromeos/policy/recommendation_restorer_factory.h"
120 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chrom eos.h" 121 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chrom eos.h"
121 #include "chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder_facto ry.h" 122 #include "chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder_facto ry.h"
122 #include "chrome/browser/chromeos/policy/user_network_configuration_updater_fact ory.h" 123 #include "chrome/browser/chromeos/policy/user_network_configuration_updater_fact ory.h"
123 #else 124 #else
124 #include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h" 125 #include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h"
125 #include "chrome/browser/policy/cloud/user_policy_signin_service_factory.h" 126 #include "chrome/browser/policy/cloud/user_policy_signin_service_factory.h"
126 #endif 127 #endif
127 #endif 128 #endif
128 129
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after
324 PasswordStoreFactory::GetInstance(); 325 PasswordStoreFactory::GetInstance();
325 #if !defined(OS_ANDROID) 326 #if !defined(OS_ANDROID)
326 PinnedTabServiceFactory::GetInstance(); 327 PinnedTabServiceFactory::GetInstance();
327 #endif 328 #endif
328 #if defined(ENABLE_PLUGINS) 329 #if defined(ENABLE_PLUGINS)
329 PluginPrefsFactory::GetInstance(); 330 PluginPrefsFactory::GetInstance();
330 #endif 331 #endif
331 policy::ProfilePolicyConnectorFactory::GetInstance(); 332 policy::ProfilePolicyConnectorFactory::GetInstance();
332 #if defined(ENABLE_CONFIGURATION_POLICY) 333 #if defined(ENABLE_CONFIGURATION_POLICY)
333 #if defined(OS_CHROMEOS) 334 #if defined(OS_CHROMEOS)
335 policy::NetworkPolicyServiceFactory::GetInstance();
334 policy::RecommendationRestorerFactory::GetInstance(); 336 policy::RecommendationRestorerFactory::GetInstance();
335 policy::UserCloudPolicyManagerFactoryChromeOS::GetInstance(); 337 policy::UserCloudPolicyManagerFactoryChromeOS::GetInstance();
336 policy::UserCloudPolicyTokenForwarderFactory::GetInstance(); 338 policy::UserCloudPolicyTokenForwarderFactory::GetInstance();
337 policy::UserNetworkConfigurationUpdaterFactory::GetInstance(); 339 policy::UserNetworkConfigurationUpdaterFactory::GetInstance();
338 #else 340 #else
339 policy::UserCloudPolicyManagerFactory::GetInstance(); 341 policy::UserCloudPolicyManagerFactory::GetInstance();
340 policy::UserPolicySigninServiceFactory::GetInstance(); 342 policy::UserPolicySigninServiceFactory::GetInstance();
341 #endif 343 #endif
342 policy::UserCloudPolicyInvalidatorFactory::GetInstance(); 344 policy::UserCloudPolicyInvalidatorFactory::GetInstance();
343 #endif 345 #endif
(...skipping 25 matching lines...) Expand all
369 TokenServiceFactory::GetInstance(); 371 TokenServiceFactory::GetInstance();
370 #if !defined(OS_ANDROID) 372 #if !defined(OS_ANDROID)
371 UserStyleSheetWatcherFactory::GetInstance(); 373 UserStyleSheetWatcherFactory::GetInstance();
372 #endif 374 #endif
373 WebDataServiceFactory::GetInstance(); 375 WebDataServiceFactory::GetInstance();
374 } 376 }
375 377
376 void ChromeBrowserMainExtraPartsProfiles::PreProfileInit() { 378 void ChromeBrowserMainExtraPartsProfiles::PreProfileInit() {
377 EnsureBrowserContextKeyedServiceFactoriesBuilt(); 379 EnsureBrowserContextKeyedServiceFactoriesBuilt();
378 } 380 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698