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

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

Issue 118043003: Fix app_shell shutdown crash due to BrowserContextKeyedServices (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ScopedFactoryForTest (shutdown_crash) Created 6 years, 11 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
Index: chrome/browser/extensions/chrome_extensions_browser_client.cc
diff --git a/chrome/browser/extensions/chrome_extensions_browser_client.cc b/chrome/browser/extensions/chrome_extensions_browser_client.cc
index f6b129246f6011c42ab595d6cccefca3204a14f1..da56988a7aa9d62b745df350709cce46ce599d35 100644
--- a/chrome/browser/extensions/chrome_extensions_browser_client.cc
+++ b/chrome/browser/extensions/chrome_extensions_browser_client.cc
@@ -10,6 +10,8 @@
#include "chrome/browser/browser_process.h"
#include "chrome/browser/extensions/chrome_app_sorting.h"
#include "chrome/browser/extensions/extension_prefs.h"
+#include "chrome/browser/extensions/extension_system.h"
+#include "chrome/browser/extensions/extension_system_factory.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/ui/app_modal_dialogs/javascript_dialog_manager.h"
@@ -154,4 +156,16 @@ ChromeExtensionsBrowserClient::GetJavaScriptDialogManager() {
return GetJavaScriptDialogManagerInstance();
}
+std::vector<BrowserContextKeyedServiceFactory*>
+ChromeExtensionsBrowserClient::GetExtensionSystemDependencies() {
+ std::vector<BrowserContextKeyedServiceFactory*> dependencies;
+ dependencies.push_back(ExtensionSystemSharedFactory::GetInstance());
+ return dependencies;
+}
+
+ExtensionSystem* ChromeExtensionsBrowserClient::CreateExtensionSystem(
+ content::BrowserContext* context) {
+ return new ExtensionSystemImpl(static_cast<Profile*>(context));
+}
+
} // namespace extensions
« no previous file with comments | « chrome/browser/extensions/chrome_extensions_browser_client.h ('k') | chrome/browser/extensions/extension_system_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698