From 1930a11fbd7d49a75ad341b0c33489c60dfaaa11 Mon Sep 17 00:00:00 2001 From: "pfeldman@chromium.org" Date: Wed, 9 Feb 2011 15:16:11 +0000 Subject: 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 --- chrome/browser/debugger/devtools_http_protocol_handler.cc | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'chrome') 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, -- cgit v1.1