From 731df977c0511bca2206b5f333555b1205ff1f43 Mon Sep 17 00:00:00 2001 From: Iain Merrick Date: Mon, 1 Nov 2010 12:19:54 +0000 Subject: Merge Chromium at r63472 : Initial merge by git. Change-Id: Ifb9ee821af006a5f2211e81471be93ae440a1f5a --- chrome/browser/extensions/extension_popup_api.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'chrome/browser/extensions/extension_popup_api.cc') diff --git a/chrome/browser/extensions/extension_popup_api.cc b/chrome/browser/extensions/extension_popup_api.cc index 8b12d5b..72f3962 100644 --- a/chrome/browser/extensions/extension_popup_api.cc +++ b/chrome/browser/extensions/extension_popup_api.cc @@ -9,8 +9,8 @@ #include "base/stringprintf.h" #include "base/values.h" #include "chrome/browser/extensions/extension_dom_ui.h" +#include "chrome/browser/extensions/extension_event_router.h" #include "chrome/browser/extensions/extension_host.h" -#include "chrome/browser/extensions/extension_message_service.h" #include "chrome/browser/browser.h" #include "chrome/browser/browser_window.h" #include "chrome/browser/profile.h" @@ -508,6 +508,6 @@ void PopupEventRouter::OnPopupClosed(Profile* profile, extension_popup_module_events::kOnPopupClosed, routing_id); - profile->GetExtensionMessageService()->DispatchEventToRenderers( + profile->GetExtensionEventRouter()->DispatchEventToRenderers( full_event_name, base::JSONWriter::kEmptyArray, profile, GURL()); } -- cgit v1.1