diff options
| author | yurys@chromium.org <yurys@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-11 09:08:17 +0000 |
|---|---|---|
| committer | yurys@chromium.org <yurys@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-11 09:08:17 +0000 |
| commit | 221f4130ad35eb3074ee079dae571157da727a9d (patch) | |
| tree | d647bcdd73ef1e35568d4beb3a7a0e3ed4d4b993 /chrome/browser/debugger | |
| parent | 797f01294b84d46813da707e0ed406dfd27a0f35 (diff) | |
| download | chromium_src-221f4130ad35eb3074ee079dae571157da727a9d.zip chromium_src-221f4130ad35eb3074ee079dae571157da727a9d.tar.gz chromium_src-221f4130ad35eb3074ee079dae571157da727a9d.tar.bz2 | |
DevTools: use WebDevToolsMessageData for devtools rpc messages
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=34333
Review URL: http://codereview.chromium.org/463065
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34337 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/debugger')
| -rw-r--r-- | chrome/browser/debugger/inspectable_tab_proxy.cc | 17 | ||||
| -rw-r--r-- | chrome/browser/debugger/inspectable_tab_proxy.h | 7 |
2 files changed, 9 insertions, 15 deletions
diff --git a/chrome/browser/debugger/inspectable_tab_proxy.cc b/chrome/browser/debugger/inspectable_tab_proxy.cc index 29e5d32..159be0b 100644 --- a/chrome/browser/debugger/inspectable_tab_proxy.cc +++ b/chrome/browser/debugger/inspectable_tab_proxy.cc @@ -34,21 +34,18 @@ void DevToolsClientHostImpl::SendMessageToClient( IPC_END_MESSAGE_MAP() } -void DevToolsClientHostImpl::OnRpcMessage(const std::string& class_name, - const std::string& message_name, - const std::string& param1, - const std::string& param2, - const std::string& param3) { +void DevToolsClientHostImpl::OnRpcMessage(const DevToolsMessageData& data) { static const std::string kDebuggerAgentDelegate = "DebuggerAgentDelegate"; static const std::string kToolsAgentDelegate = "ToolsAgentDelegate"; static const std::string kDebuggerOutput = "DebuggerOutput"; static const std::string kFrameNavigate = "FrameNavigate"; - if (class_name == kDebuggerAgentDelegate && message_name == kDebuggerOutput) { - DebuggerOutput(param1); - } else if (class_name == kToolsAgentDelegate && - message_name == kFrameNavigate) { - FrameNavigate(param1); + if (data.class_name == kDebuggerAgentDelegate && + data.method_name == kDebuggerOutput) { + DebuggerOutput(data.arguments[0]); + } else if (data.class_name == kToolsAgentDelegate && + data.method_name == kFrameNavigate) { + FrameNavigate(data.arguments[0]); } } diff --git a/chrome/browser/debugger/inspectable_tab_proxy.h b/chrome/browser/debugger/inspectable_tab_proxy.h index 13da2ec..67b5952 100644 --- a/chrome/browser/debugger/inspectable_tab_proxy.h +++ b/chrome/browser/debugger/inspectable_tab_proxy.h @@ -15,6 +15,7 @@ class DebuggerRemoteService; class DevToolsClientHost; class DevToolsClientHostImpl; class NavigationController; +struct DevToolsMessageData; // Proxies debugged tabs' NavigationControllers using their UIDs. // Keeps track of tabs being debugged so that we can detach from @@ -81,11 +82,7 @@ class DevToolsClientHostImpl : public DevToolsClientHost { private: // Message handling routines - void OnRpcMessage(const std::string& class_name, - const std::string& message_name, - const std::string& param1, - const std::string& param2, - const std::string& param3); + void OnRpcMessage(const DevToolsMessageData& data); void DebuggerOutput(const std::string& msg); void FrameNavigate(const std::string& url); void TabClosed(); |