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

Unified Diff: chrome/browser/profiles/profile_dependency_manager.cc

Issue 9985002: Allow SessionService to be disabled. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: addressed sky's comments Created 8 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/browsing_data_remover.cc ('k') | chrome/browser/profiles/profile_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/profiles/profile_dependency_manager.cc
diff --git a/chrome/browser/profiles/profile_dependency_manager.cc b/chrome/browser/profiles/profile_dependency_manager.cc
index 726c3cd136d97b9f2b67f83e505c4c65fcf34501..97579174fdd39a02e0443bac40658b1add95c9ec 100644
--- a/chrome/browser/profiles/profile_dependency_manager.cc
+++ b/chrome/browser/profiles/profile_dependency_manager.cc
@@ -167,13 +167,7 @@ void ProfileDependencyManager::AssertFactoriesBuilt() {
return;
BackgroundContentsServiceFactory::GetInstance();
-#if !defined(OS_ANDROID)
- CloudPrintProxyServiceFactory::GetInstance();
-#endif
CookieSettings::Factory::GetInstance();
-#if defined(ENABLE_NOTIFICATIONS)
- DesktopNotificationServiceFactory::GetInstance();
-#endif
DownloadServiceFactory::GetInstance();
FindBarStateFactory::GetInstance();
GlobalErrorServiceFactory::GetInstance();
@@ -181,28 +175,34 @@ void ProfileDependencyManager::AssertFactoriesBuilt() {
NTPResourceCacheFactory::GetInstance();
PasswordStoreFactory::GetInstance();
PersonalDataManagerFactory::GetInstance();
+ PluginPrefsFactory::GetInstance();
+ prerender::PrerenderManagerFactory::GetInstance();
+ ProfileSyncServiceFactory::GetInstance();
+ SigninManagerFactory::GetInstance();
+ SpellCheckFactory::GetInstance();
+ TabRestoreServiceFactory::GetInstance();
+ TemplateURLFetcherFactory::GetInstance();
+ TemplateURLServiceFactory::GetInstance();
+ TokenServiceFactory::GetInstance();
#if !defined(OS_ANDROID)
+ CloudPrintProxyServiceFactory::GetInstance();
PinnedTabServiceFactory::GetInstance();
#endif
- PluginPrefsFactory::GetInstance();
+#if defined(ENABLE_NOTIFICATIONS)
+ DesktopNotificationServiceFactory::GetInstance();
+#endif
#if defined(ENABLE_PROTECTOR_SERVICE)
protector::ProtectorServiceFactory::GetInstance();
#endif
- prerender::PrerenderManagerFactory::GetInstance();
- ProfileSyncServiceFactory::GetInstance();
+#if defined(ENABLE_SESSION_SERVICE)
SessionServiceFactory::GetInstance();
- SigninManagerFactory::GetInstance();
+#endif
#if defined(ENABLE_INPUT_SPEECH)
SpeechInputExtensionManager::InitializeFactory();
#endif
- SpellCheckFactory::GetInstance();
- TabRestoreServiceFactory::GetInstance();
#if defined(ENABLE_THEMES)
ThemeServiceFactory::GetInstance();
#endif
- TemplateURLFetcherFactory::GetInstance();
- TemplateURLServiceFactory::GetInstance();
- TokenServiceFactory::GetInstance();
#if defined(ENABLE_WEB_INTENTS)
WebIntentsRegistryFactory::GetInstance();
#endif
« no previous file with comments | « chrome/browser/browsing_data_remover.cc ('k') | chrome/browser/profiles/profile_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698