summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorpfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-09 15:16:11 +0000
committerpfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-09 15:16:11 +0000
commit1930a11fbd7d49a75ad341b0c33489c60dfaaa11 (patch)
treee7ce942484b7f3a44216cdc17a8252a109ddb0ee /chrome
parentdb3abe61469c781453fed28d9c4b28b5b6af0bcc (diff)
downloadchromium_src-1930a11fbd7d49a75ad341b0c33489c60dfaaa11.zip
chromium_src-1930a11fbd7d49a75ad341b0c33489c60dfaaa11.tar.gz
chromium_src-1930a11fbd7d49a75ad341b0c33489c60dfaaa11.tar.bz2
DevTools: remove loaded from remote debugging handshake.
BUG= TEST= Review URL: http://codereview.chromium.org/6458028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74289 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/debugger/devtools_http_protocol_handler.cc11
1 files changed, 6 insertions, 5 deletions
diff --git a/chrome/browser/debugger/devtools_http_protocol_handler.cc b/chrome/browser/debugger/devtools_http_protocol_handler.cc
index cee6b20a..43ac93b 100644
--- a/chrome/browser/debugger/devtools_http_protocol_handler.cc
+++ b/chrome/browser/debugger/devtools_http_protocol_handler.cc
@@ -279,6 +279,10 @@ void DevToolsHttpProtocolHandler::OnWebSocketRequestUI(
manager->RegisterDevToolsClientHostFor(
tab_contents->render_view_host(),
client_host);
+ manager->ForwardToDevToolsAgent(
+ client_host,
+ DevToolsAgentMsg_FrontendLoaded());
+
AcceptWebSocket(connection_id, request);
}
@@ -292,12 +296,9 @@ void DevToolsHttpProtocolHandler::OnWebSocketMessageUI(
DevToolsManager* manager = DevToolsManager::GetInstance();
- if (data == "loaded") {
- manager->ForwardToDevToolsAgent(
- it->second,
- DevToolsAgentMsg_FrontendLoaded());
+ //TODO(pfeldman): remove this once front-end stops sending it upstream.
+ if (data == "loaded")
return;
- }
manager->ForwardToDevToolsAgent(
it->second,