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

Unified Diff: chrome/browser/extensions/extension_system_factory.cc

Issue 10704148: Protect references to ThemeService* with ENABLE_THEMES (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 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/extensions/extension_service_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/extension_system_factory.cc
diff --git a/chrome/browser/extensions/extension_system_factory.cc b/chrome/browser/extensions/extension_system_factory.cc
index c1700780b5adb5dd1e9ddde60c496c7cd33565f7..8d162ed072d71dc37281f4135d353e500b374b13 100644
--- a/chrome/browser/extensions/extension_system_factory.cc
+++ b/chrome/browser/extensions/extension_system_factory.cc
@@ -33,9 +33,13 @@ ExtensionSystemSharedFactory::ExtensionSystemSharedFactory()
"ExtensionSystemShared",
ProfileDependencyManager::GetInstance()) {
DependsOn(GlobalErrorServiceFactory::GetInstance());
+#if defined(ENABLE_THEMES)
DependsOn(ThemeServiceFactory::GetInstance());
+#endif
+#if defined(ENABLE_PROTECTOR_SERVICE)
// ProtectorService should be destroyed after us.
DependsOn(protector::ProtectorServiceFactory::GetInstance());
+#endif
}
ExtensionSystemSharedFactory::~ExtensionSystemSharedFactory() {
« no previous file with comments | « chrome/browser/extensions/extension_service_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698