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

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

Issue 17068004: Revert 207755 "Add device policies to control accessibility sett..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 6 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 "apps/shortcut_manager_factory.h" 10 #include "apps/shortcut_manager_factory.h"
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 #include "chrome/browser/undo/undo_service_factory.h" 93 #include "chrome/browser/undo/undo_service_factory.h"
94 #include "chrome/browser/user_style_sheet_watcher_factory.h" 94 #include "chrome/browser/user_style_sheet_watcher_factory.h"
95 #include "chrome/browser/webdata/web_data_service_factory.h" 95 #include "chrome/browser/webdata/web_data_service_factory.h"
96 96
97 #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION) 97 #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION)
98 #include "chrome/browser/captive_portal/captive_portal_service_factory.h" 98 #include "chrome/browser/captive_portal/captive_portal_service_factory.h"
99 #endif 99 #endif
100 100
101 #if defined(ENABLE_CONFIGURATION_POLICY) 101 #if defined(ENABLE_CONFIGURATION_POLICY)
102 #if defined(OS_CHROMEOS) 102 #if defined(OS_CHROMEOS)
103 #include "chrome/browser/chromeos/policy/recommendation_restorer_factory.h"
104 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chrom eos.h" 103 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chrom eos.h"
105 #include "chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder_facto ry.h" 104 #include "chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder_facto ry.h"
106 #else 105 #else
107 #include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h" 106 #include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h"
108 #include "chrome/browser/policy/cloud/user_policy_signin_service_factory.h" 107 #include "chrome/browser/policy/cloud/user_policy_signin_service_factory.h"
109 #endif 108 #endif
110 #endif 109 #endif
111 110
112 #if defined(ENABLE_MANAGED_USERS) 111 #if defined(ENABLE_MANAGED_USERS)
113 #include "chrome/browser/managed_mode/managed_user_service_factory.h" 112 #include "chrome/browser/managed_mode/managed_user_service_factory.h"
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
267 PasswordStoreFactory::GetInstance(); 266 PasswordStoreFactory::GetInstance();
268 #if !defined(OS_ANDROID) 267 #if !defined(OS_ANDROID)
269 PinnedTabServiceFactory::GetInstance(); 268 PinnedTabServiceFactory::GetInstance();
270 #endif 269 #endif
271 #if defined(ENABLE_PLUGINS) 270 #if defined(ENABLE_PLUGINS)
272 PluginPrefsFactory::GetInstance(); 271 PluginPrefsFactory::GetInstance();
273 #endif 272 #endif
274 policy::ProfilePolicyConnectorFactory::GetInstance(); 273 policy::ProfilePolicyConnectorFactory::GetInstance();
275 #if defined(ENABLE_CONFIGURATION_POLICY) 274 #if defined(ENABLE_CONFIGURATION_POLICY)
276 #if defined(OS_CHROMEOS) 275 #if defined(OS_CHROMEOS)
277 policy::RecommendationRestorerFactory::GetInstance();
278 policy::UserCloudPolicyManagerFactoryChromeOS::GetInstance(); 276 policy::UserCloudPolicyManagerFactoryChromeOS::GetInstance();
279 policy::UserCloudPolicyTokenForwarderFactory::GetInstance(); 277 policy::UserCloudPolicyTokenForwarderFactory::GetInstance();
280 #else 278 #else
281 policy::UserCloudPolicyManagerFactory::GetInstance(); 279 policy::UserCloudPolicyManagerFactory::GetInstance();
282 policy::UserPolicySigninServiceFactory::GetInstance(); 280 policy::UserPolicySigninServiceFactory::GetInstance();
283 #endif 281 #endif
284 #endif 282 #endif
285 predictors::AutocompleteActionPredictorFactory::GetInstance(); 283 predictors::AutocompleteActionPredictorFactory::GetInstance();
286 predictors::PredictorDatabaseFactory::GetInstance(); 284 predictors::PredictorDatabaseFactory::GetInstance();
287 predictors::ResourcePrefetchPredictorFactory::GetInstance(); 285 predictors::ResourcePrefetchPredictorFactory::GetInstance();
(...skipping 18 matching lines...) Expand all
306 TokenServiceFactory::GetInstance(); 304 TokenServiceFactory::GetInstance();
307 #if !defined(OS_ANDROID) 305 #if !defined(OS_ANDROID)
308 UserStyleSheetWatcherFactory::GetInstance(); 306 UserStyleSheetWatcherFactory::GetInstance();
309 #endif 307 #endif
310 WebDataServiceFactory::GetInstance(); 308 WebDataServiceFactory::GetInstance();
311 } 309 }
312 310
313 void ChromeBrowserMainExtraPartsProfiles::PreProfileInit() { 311 void ChromeBrowserMainExtraPartsProfiles::PreProfileInit() {
314 EnsureBrowserContextKeyedServiceFactoriesBuilt(); 312 EnsureBrowserContextKeyedServiceFactoriesBuilt();
315 } 313 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698