summaryrefslogtreecommitdiffstats
path: root/chrome/browser/debugger/devtools_http_protocol_handler.cc
diff options
context:
space:
mode:
authorpfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-05 09:40:51 +0000
committerpfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-05 09:40:51 +0000
commitfd9dc809f2a84199a3457fee0c1b72792e3e1660 (patch)
tree2112e63fbe0ccb8d5427eaa8a7e0cc89d02073b3 /chrome/browser/debugger/devtools_http_protocol_handler.cc
parent919da4005f83642977db4fca5b12005682023c6d (diff)
downloadchromium_src-fd9dc809f2a84199a3457fee0c1b72792e3e1660.zip
chromium_src-fd9dc809f2a84199a3457fee0c1b72792e3e1660.tar.gz
chromium_src-fd9dc809f2a84199a3457fee0c1b72792e3e1660.tar.bz2
DevTools: get rid of delayed command dispatching on front-end side.
Review URL: http://codereview.chromium.org/3020063 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55047 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/debugger/devtools_http_protocol_handler.cc')
-rw-r--r--chrome/browser/debugger/devtools_http_protocol_handler.cc13
1 files changed, 11 insertions, 2 deletions
diff --git a/chrome/browser/debugger/devtools_http_protocol_handler.cc b/chrome/browser/debugger/devtools_http_protocol_handler.cc
index beccf9a..6efa6b7 100644
--- a/chrome/browser/debugger/devtools_http_protocol_handler.cc
+++ b/chrome/browser/debugger/devtools_http_protocol_handler.cc
@@ -59,7 +59,7 @@ class DevToolsClientHostImpl : public DevToolsClientHost {
private:
// Message handling routines
void OnDispatchOnInspectorFrontend(const std::string& data) {
- socket_->SendOverWebSocket("devtools$$dispatch(" + data + ")");
+ socket_->SendOverWebSocket(data);
}
HttpListenSocket* socket_;
};
@@ -243,7 +243,16 @@ void DevToolsHttpProtocolHandler::OnWebSocketMessageUI(
return;
DevToolsManager* manager = DevToolsManager::GetInstance();
- manager->ForwardToDevToolsAgent(it->second,
+
+ if (data == "loaded") {
+ manager->ForwardToDevToolsAgent(
+ it->second,
+ DevToolsAgentMsg_FrontendLoaded());
+ return;
+ }
+
+ manager->ForwardToDevToolsAgent(
+ it->second,
DevToolsAgentMsg_DispatchOnInspectorBackend(data));
}