diff options
Diffstat (limited to 'chrome/browser/extensions')
3 files changed, 12 insertions, 8 deletions
diff --git a/chrome/browser/extensions/extension_devtools_bridge.cc b/chrome/browser/extensions/extension_devtools_bridge.cc index 2ac456f..2702394 100644 --- a/chrome/browser/extensions/extension_devtools_bridge.cc +++ b/chrome/browser/extensions/extension_devtools_bridge.cc @@ -85,17 +85,19 @@ static const char kTabUrlChangeEventMessageName[] = "TabUrlChangeEventMessage"; void ExtensionDevToolsBridge::OnRpcMessage(const std::string& class_name, const std::string& message_name, - const std::string& msg) { + const std::string& param1, + const std::string& param2, + const std::string& param3) { DCHECK_EQ(MessageLoop::current()->type(), MessageLoop::TYPE_UI); // TODO(jamesr): Update the filtering and message creation logic once // the TimelineAgent lands in WebKit. if (class_name == kTimelineAgentClassName) { if (message_name == kPageEventMessageName) { - std::string json = StringPrintf("[{\"record\": \"%s\"}]", msg.c_str()); + std::string json = StringPrintf("[{\"record\": \"%s\"}]", param1.c_str()); profile_->GetExtensionMessageService()-> DispatchEventToRenderers(on_page_event_name_, json); } else if (message_name == kTabUrlChangeEventMessageName) { - std::string json = StringPrintf("[{\"record\": \"%s\"}]", msg.c_str()); + std::string json = StringPrintf("[{\"record\": \"%s\"}]", param1.c_str()); profile_->GetExtensionMessageService()-> DispatchEventToRenderers(on_tab_url_change_event_name_, json); } diff --git a/chrome/browser/extensions/extension_devtools_bridge.h b/chrome/browser/extensions/extension_devtools_bridge.h index b4cb98d..d6fd960 100644 --- a/chrome/browser/extensions/extension_devtools_bridge.h +++ b/chrome/browser/extensions/extension_devtools_bridge.h @@ -34,7 +34,9 @@ class ExtensionDevToolsBridge : public DevToolsClientHost { private: void OnRpcMessage(const std::string& class_name, const std::string& message_name, - const std::string& msg); + const std::string& param1, + const std::string& param2, + const std::string& param3); // ID of the tab we are monitoring. int tab_id_; diff --git a/chrome/browser/extensions/extension_devtools_browsertests.cc b/chrome/browser/extensions/extension_devtools_browsertests.cc index 9aaa071..19f7ba4 100644 --- a/chrome/browser/extensions/extension_devtools_browsertests.cc +++ b/chrome/browser/extensions/extension_devtools_browsertests.cc @@ -63,7 +63,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionDevToolsBrowserTest, TimelineApi) { TabContents* tab_contents = browser()->tabstrip_model()->GetTabContentsAt(0); ASSERT_TRUE(tab_contents); int tab_id = ExtensionTabUtil::GetTabId(tab_contents); - + // Test setup. bool result = false; std::wstring register_listeners_js = StringPrintf(L"setListenersOnTab(%d)", @@ -81,7 +81,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionDevToolsBrowserTest, TimelineApi) { // Test onTabUrlChange event. DevToolsClientMsg_RpcMessage tabUrlChangeEventMessage( - "TimelineAgentClass", "TabUrlChangeEventMessage", "{}"); + "TimelineAgentClass", "TabUrlChangeEventMessage", "", "", ""); devtools_client_host->SendMessageToClient(tabUrlChangeEventMessage); ui_test_utils::ExecuteJavaScriptAndExtractBool( host->render_view_host(), @@ -93,7 +93,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionDevToolsBrowserTest, TimelineApi) { // Test onPageEvent event. result = false; DevToolsClientMsg_RpcMessage pageEventMessage( - "TimelineAgentClass", "PageEventMessage", "{}"); + "TimelineAgentClass", "PageEventMessage", "", "", ""); devtools_client_host->SendMessageToClient(pageEventMessage); ui_test_utils::ExecuteJavaScriptAndExtractBool( host->render_view_host(), L"", L"testReceivePageEvent()", &result); @@ -130,7 +130,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionDevToolsBrowserTest, ProcessRefCounting) { TabContents* tab_contents = browser()->tabstrip_model()->GetTabContentsAt(0); ASSERT_TRUE(tab_contents); int tab_id = ExtensionTabUtil::GetTabId(tab_contents); - + // Test setup. bool result = false; std::wstring register_listeners_js = StringPrintf(L"setListenersOnTab(%d)", |