| Index: chrome/browser/extensions/extension_event_router_forwarder.cc
|
| diff --git a/chrome/browser/extensions/extension_event_router_forwarder.cc b/chrome/browser/extensions/extension_event_router_forwarder.cc
|
| index 523132451b66d6bf2bd9ef554bcdb35fbf41ad08..b82585db76dd5f0eaa1f516c8c21eefdb5956ea3 100644
|
| --- a/chrome/browser/extensions/extension_event_router_forwarder.cc
|
| +++ b/chrome/browser/extensions/extension_event_router_forwarder.cc
|
| @@ -5,6 +5,7 @@
|
| #include "chrome/browser/extensions/extension_event_router_forwarder.h"
|
|
|
| #include "base/bind.h"
|
| +#include "base/values.h"
|
| #include "chrome/browser/browser_process.h"
|
| #include "chrome/browser/extensions/extension_event_router.h"
|
| #include "chrome/browser/profiles/profile_manager.h"
|
| @@ -20,14 +21,14 @@ ExtensionEventRouterForwarder::~ExtensionEventRouterForwarder() {
|
|
|
| void ExtensionEventRouterForwarder::BroadcastEventToRenderers(
|
| const std::string& event_name,
|
| - const std::string& event_args,
|
| + base::ListValue* event_args,
|
| const GURL& event_url) {
|
| HandleEvent("", event_name, event_args, 0, true, event_url);
|
| }
|
|
|
| void ExtensionEventRouterForwarder::DispatchEventToRenderers(
|
| const std::string& event_name,
|
| - const std::string& event_args,
|
| + base::ListValue* event_args,
|
| void* profile,
|
| bool use_profile_to_restrict_events,
|
| const GURL& event_url) {
|
| @@ -40,7 +41,7 @@ void ExtensionEventRouterForwarder::DispatchEventToRenderers(
|
| void ExtensionEventRouterForwarder::BroadcastEventToExtension(
|
| const std::string& extension_id,
|
| const std::string& event_name,
|
| - const std::string& event_args,
|
| + base::ListValue* event_args,
|
| const GURL& event_url) {
|
| HandleEvent(extension_id, event_name, event_args, 0, true, event_url);
|
| }
|
| @@ -48,7 +49,7 @@ void ExtensionEventRouterForwarder::BroadcastEventToExtension(
|
| void ExtensionEventRouterForwarder::DispatchEventToExtension(
|
| const std::string& extension_id,
|
| const std::string& event_name,
|
| - const std::string& event_args,
|
| + base::ListValue* event_args,
|
| void* profile,
|
| bool use_profile_to_restrict_events,
|
| const GURL& event_url) {
|
| @@ -61,7 +62,7 @@ void ExtensionEventRouterForwarder::DispatchEventToExtension(
|
| void ExtensionEventRouterForwarder::HandleEvent(
|
| const std::string& extension_id,
|
| const std::string& event_name,
|
| - const std::string& event_args,
|
| + base::ListValue* event_args,
|
| void* profile_ptr,
|
| bool use_profile_to_restrict_events,
|
| const GURL& event_url) {
|
| @@ -102,7 +103,7 @@ void ExtensionEventRouterForwarder::CallExtensionEventRouter(
|
| Profile* profile,
|
| const std::string& extension_id,
|
| const std::string& event_name,
|
| - const std::string& event_args,
|
| + base::ListValue* event_args,
|
| Profile* restrict_to_profile,
|
| const GURL& event_url) {
|
| // We may not have an extension in cases like chromeos login
|
|
|