From 2c699655d5ed9cbf296a9389c3efe2a9fe01973e Mon Sep 17 00:00:00 2001 From: "mpcomplete@chromium.org" Date: Fri, 15 Oct 2010 18:22:41 +0000 Subject: Pull events-related code out of ExtensionMessageService into its own class. The events code is independent of the messaging code and didn't belong in the same class. This is part 1 of an extension event refactor. See bug for more details. BUG=58214 TEST=covered by tests Review URL: http://codereview.chromium.org/3758005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62764 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/extensions/extension_browser_event_router.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'chrome/browser/extensions/extension_browser_event_router.cc') diff --git a/chrome/browser/extensions/extension_browser_event_router.cc b/chrome/browser/extensions/extension_browser_event_router.cc index 6728c8d..ed37fa9 100644 --- a/chrome/browser/extensions/extension_browser_event_router.cc +++ b/chrome/browser/extensions/extension_browser_event_router.cc @@ -9,7 +9,7 @@ #include "chrome/browser/browser.h" #include "chrome/browser/profile.h" #include "chrome/browser/extensions/extension_event_names.h" -#include "chrome/browser/extensions/extension_message_service.h" +#include "chrome/browser/extensions/extension_event_router.h" #include "chrome/browser/extensions/extension_tabs_module_constants.h" #include "chrome/browser/extensions/extension_page_actions_module_constants.h" #include "chrome/browser/tab_contents/navigation_entry.h" @@ -67,8 +67,8 @@ ExtensionBrowserEventRouter* ExtensionBrowserEventRouter::GetInstance() { static void DispatchEvent(Profile* profile, const char* event_name, const std::string json_args) { - if (profile->GetExtensionMessageService()) { - profile->GetExtensionMessageService()->DispatchEventToRenderers( + if (profile->GetExtensionEventRouter()) { + profile->GetExtensionEventRouter()->DispatchEventToRenderers( event_name, json_args, profile, GURL()); } } @@ -476,7 +476,7 @@ void ExtensionBrowserEventRouter::PageActionExecuted( NULL, NULL, &tab_contents, NULL)) { return; } - std::string event_name = ExtensionMessageService::GetPerExtensionEventName( + std::string event_name = ExtensionEventRouter::GetPerExtensionEventName( "pageAction.onClicked", extension_id); DispatchEventWithTab(profile, event_name.c_str(), tab_contents); } @@ -487,7 +487,7 @@ void ExtensionBrowserEventRouter::BrowserActionExecuted( int tab_id = 0; if (!ExtensionTabUtil::GetDefaultTab(browser, &tab_contents, &tab_id)) return; - std::string event_name = ExtensionMessageService::GetPerExtensionEventName( + std::string event_name = ExtensionEventRouter::GetPerExtensionEventName( "browserAction.onClicked", extension_id); DispatchEventWithTab(profile, event_name.c_str(), tab_contents); } -- cgit v1.1