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

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

Issue 10823212: Relanding this as this did not fix the chromiumos breakage. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 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
« no previous file with comments | « chrome/browser/profiles/profile.h ('k') | chrome/browser/profiles/profile_impl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Added: svn:mergeinfo
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/profile_dependency_manager.h" 5 #include "chrome/browser/profiles/profile_dependency_manager.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <deque> 8 #include <deque>
9 #include <iterator> 9 #include <iterator>
10 10
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 #include "chrome/browser/ui/find_bar/find_bar_state_factory.h" 53 #include "chrome/browser/ui/find_bar/find_bar_state_factory.h"
54 #include "chrome/browser/ui/global_error/global_error_service_factory.h" 54 #include "chrome/browser/ui/global_error/global_error_service_factory.h"
55 #include "chrome/browser/ui/tabs/pinned_tab_service_factory.h" 55 #include "chrome/browser/ui/tabs/pinned_tab_service_factory.h"
56 #include "chrome/browser/ui/webui/chrome_url_data_manager_factory.h" 56 #include "chrome/browser/ui/webui/chrome_url_data_manager_factory.h"
57 #include "chrome/browser/ui/webui/ntp/ntp_resource_cache_factory.h" 57 #include "chrome/browser/ui/webui/ntp/ntp_resource_cache_factory.h"
58 #include "chrome/browser/user_style_sheet_watcher_factory.h" 58 #include "chrome/browser/user_style_sheet_watcher_factory.h"
59 #include "chrome/browser/webdata/web_data_service_factory.h" 59 #include "chrome/browser/webdata/web_data_service_factory.h"
60 60
61 #if defined(ENABLE_CONFIGURATION_POLICY) 61 #if defined(ENABLE_CONFIGURATION_POLICY)
62 #include "chrome/browser/policy/managed_mode_policy_provider_factory.h" 62 #include "chrome/browser/policy/managed_mode_policy_provider_factory.h"
63 #include "chrome/browser/policy/user_policy_signin_service_factory.h"
63 #endif 64 #endif
64 65
65 #if defined(USE_AURA) 66 #if defined(USE_AURA)
66 #include "chrome/browser/ui/gesture_prefs_observer_factory_aura.h" 67 #include "chrome/browser/ui/gesture_prefs_observer_factory_aura.h"
67 #endif 68 #endif
68 69
69 #ifndef NDEBUG 70 #ifndef NDEBUG
70 #include "base/command_line.h" 71 #include "base/command_line.h"
71 #include "base/file_util.h" 72 #include "base/file_util.h"
72 #include "chrome/common/chrome_switches.h" 73 #include "chrome/common/chrome_switches.h"
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
226 ManagedModePolicyProviderFactory::GetInstance(); 227 ManagedModePolicyProviderFactory::GetInstance();
227 #endif 228 #endif
228 MediaGalleriesPreferencesFactory::GetInstance(); 229 MediaGalleriesPreferencesFactory::GetInstance();
229 NTPResourceCacheFactory::GetInstance(); 230 NTPResourceCacheFactory::GetInstance();
230 PasswordStoreFactory::GetInstance(); 231 PasswordStoreFactory::GetInstance();
231 PersonalDataManagerFactory::GetInstance(); 232 PersonalDataManagerFactory::GetInstance();
232 #if !defined(OS_ANDROID) 233 #if !defined(OS_ANDROID)
233 PinnedTabServiceFactory::GetInstance(); 234 PinnedTabServiceFactory::GetInstance();
234 #endif 235 #endif
235 PluginPrefsFactory::GetInstance(); 236 PluginPrefsFactory::GetInstance();
237 #if defined(ENABLE_CONFIGURATION_POLICY) && !defined(OS_CHROMEOS)
238 // Not used on chromeos because signin happens before the profile is loaded.
239 policy::UserPolicySigninServiceFactory::GetInstance();
240 #endif
236 predictors::AutocompleteActionPredictorFactory::GetInstance(); 241 predictors::AutocompleteActionPredictorFactory::GetInstance();
237 predictors::PredictorDatabaseFactory::GetInstance(); 242 predictors::PredictorDatabaseFactory::GetInstance();
238 predictors::ResourcePrefetchPredictorFactory::GetInstance(); 243 predictors::ResourcePrefetchPredictorFactory::GetInstance();
239 prerender::PrerenderManagerFactory::GetInstance(); 244 prerender::PrerenderManagerFactory::GetInstance();
240 prerender::PrerenderLinkManagerFactory::GetInstance(); 245 prerender::PrerenderLinkManagerFactory::GetInstance();
241 ProfileSyncServiceFactory::GetInstance(); 246 ProfileSyncServiceFactory::GetInstance();
242 ProtocolHandlerRegistryFactory::GetInstance(); 247 ProtocolHandlerRegistryFactory::GetInstance();
243 #if defined(ENABLE_PROTECTOR_SERVICE) 248 #if defined(ENABLE_PROTECTOR_SERVICE)
244 protector::ProtectorServiceFactory::GetInstance(); 249 protector::ProtectorServiceFactory::GetInstance();
245 #endif 250 #endif
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
373 } 378 }
374 379
375 result.append("\n /* Toplevel profile */\n"); 380 result.append("\n /* Toplevel profile */\n");
376 result.append(" Profile [shape=box];\n"); 381 result.append(" Profile [shape=box];\n");
377 382
378 result.append("}\n"); 383 result.append("}\n");
379 return result; 384 return result;
380 } 385 }
381 386
382 #endif 387 #endif
OLDNEW
« no previous file with comments | « chrome/browser/profiles/profile.h ('k') | chrome/browser/profiles/profile_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698