From 31d8f5f265d7e715f1555c42c10e6741976b1065 Mon Sep 17 00:00:00 2001 From: "yoz@chromium.org" Date: Mon, 2 Apr 2012 15:22:08 +0000 Subject: Reland 125805 - Reland 124817 - A profile-keyed service for Extensions, ExtensionSystem. Move InitExtensions into ExtensionSystem. Remove a few accessors (ExtensionDevToolsManager, ExtensionMessageService). The others have too many callers to fix in one go. New since last time: Moved LazyBackgroundTaskQueue into ExtensionSystem. BUG=104095 TEST=Open and close an incognito window; should not crash. TBR=aa@chromium.org,akalin@chromium.org Review URL: https://chromiumcodereview.appspot.com/9959040 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@130128 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/automation/automation_provider.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'chrome/browser/automation') diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc index e55cc0c..3dabdfd 100644 --- a/chrome/browser/automation/automation_provider.cc +++ b/chrome/browser/automation/automation_provider.cc @@ -46,6 +46,8 @@ #include "chrome/browser/extensions/extension_install_ui.h" #include "chrome/browser/extensions/extension_message_service.h" #include "chrome/browser/extensions/extension_service.h" +#include "chrome/browser/extensions/extension_system.h" +#include "chrome/browser/extensions/extension_system_factory.h" #include "chrome/browser/extensions/extension_tab_util.h" #include "chrome/browser/extensions/extension_toolbar_model.h" #include "chrome/browser/extensions/unpacked_installer.h" @@ -927,7 +929,7 @@ void AutomationProvider::ExecuteExtensionActionInActiveTabAsync( const Extension* extension = GetEnabledExtension(extension_handle); ExtensionService* service = profile_->GetExtensionService(); ExtensionMessageService* message_service = - profile_->GetExtensionMessageService(); + ExtensionSystemFactory::GetForProfile(profile_)->message_service(); Browser* browser = browser_tracker_->GetResource(browser_handle); if (extension && service && message_service && browser) { int tab_id = ExtensionTabUtil::GetTabId(browser->GetSelectedWebContents()); -- cgit v1.1