summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-03 09:47:18 +0000
committerpfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-03 09:47:18 +0000
commite15432ee56e787ad4bf56a264c2bbba700df5308 (patch)
treea83314b1c7c07bcf1a269a0df9cc37e78e02f4b2
parent2732a46df7bd9a1fc0140ea0133ad76946547c39 (diff)
downloadchromium_src-e15432ee56e787ad4bf56a264c2bbba700df5308.zip
chromium_src-e15432ee56e787ad4bf56a264c2bbba700df5308.tar.gz
chromium_src-e15432ee56e787ad4bf56a264c2bbba700df5308.tar.bz2
DevTools: fix remote debugging dispatch, provide encoding in the main connect page.
Review URL: http://codereview.chromium.org/3071016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54727 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/debugger/devtools_http_protocol_handler.cc6
1 files changed, 2 insertions, 4 deletions
diff --git a/chrome/browser/debugger/devtools_http_protocol_handler.cc b/chrome/browser/debugger/devtools_http_protocol_handler.cc
index c93ee50..beccf9a 100644
--- a/chrome/browser/debugger/devtools_http_protocol_handler.cc
+++ b/chrome/browser/debugger/devtools_http_protocol_handler.cc
@@ -59,9 +59,7 @@ class DevToolsClientHostImpl : public DevToolsClientHost {
private:
// Message handling routines
void OnDispatchOnInspectorFrontend(const std::string& data) {
- std::string message;
- message += "devtools$$dispatch(\"" + data + "\")";
- socket_->SendOverWebSocket(message);
+ socket_->SendOverWebSocket("devtools$$dispatch(" + data + ")");
}
HttpListenSocket* socket_;
};
@@ -197,7 +195,7 @@ void DevToolsHttpProtocolHandler::OnHttpRequestUI(
}
}
response += "</body></html>";
- Send200(socket, response, "text/html");
+ Send200(socket, response, "text/html; charset=UTF-8");
}
void DevToolsHttpProtocolHandler::OnWebSocketRequestUI(