summaryrefslogtreecommitdiffstats
path: root/webkit/glue/devtools/debugger_agent_manager.cc
diff options
context:
space:
mode:
authoryurys@google.com <yurys@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-21 16:02:20 +0000
committeryurys@google.com <yurys@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-21 16:02:20 +0000
commit11274acf1fb8f62103f69a7783fc5f9b9fce9df3 (patch)
treebf30fb522add9c869a93eb01d9809306aaa39ca4 /webkit/glue/devtools/debugger_agent_manager.cc
parentb7c5c4c630b0cda10673ac305041d40e410d55bd (diff)
downloadchromium_src-11274acf1fb8f62103f69a7783fc5f9b9fce9df3.zip
chromium_src-11274acf1fb8f62103f69a7783fc5f9b9fce9df3.tar.gz
chromium_src-11274acf1fb8f62103f69a7783fc5f9b9fce9df3.tar.bz2
DevTools: Messages converted to wide strings don't work on Mac and Linux. Use Utf8ToUtf16 conversion instead.
Review URL: http://codereview.chromium.org/113706 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16607 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/devtools/debugger_agent_manager.cc')
-rw-r--r--webkit/glue/devtools/debugger_agent_manager.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/webkit/glue/devtools/debugger_agent_manager.cc b/webkit/glue/devtools/debugger_agent_manager.cc
index 3cdd09d..3266dce 100644
--- a/webkit/glue/devtools/debugger_agent_manager.cc
+++ b/webkit/glue/devtools/debugger_agent_manager.cc
@@ -226,7 +226,7 @@ void DebuggerAgentManager::OnV8DebugMessage(const v8::Debug::Message& message) {
void DebuggerAgentManager::ExecuteDebuggerCommand(
const std::string& command,
int caller_id) {
- SendCommandToV8(UTF8ToWide(command), new CallerIdWrapper(caller_id));
+ SendCommandToV8(UTF8ToUTF16(command), new CallerIdWrapper(caller_id));
}
// static
@@ -258,7 +258,7 @@ void DebuggerAgentManager::OnWebViewClosed(WebViewImpl* webview) {
}
// static
-void DebuggerAgentManager::SendCommandToV8(const std::wstring& cmd,
+void DebuggerAgentManager::SendCommandToV8(const string16& cmd,
v8::Debug::ClientData* data) {
#if USE(V8)
v8::Debug::SendCommand(reinterpret_cast<const uint16_t*>(cmd.data()),
@@ -270,7 +270,7 @@ void DebuggerAgentManager::SendCommandToV8(const std::wstring& cmd,
void DebuggerAgentManager::SendContinueCommandToV8() {
std::wstring continue_cmd(
L"{\"seq\":1,\"type\":\"request\",\"command\":\"continue\"}");
- SendCommandToV8(continue_cmd, new CallerIdWrapper());
+ SendCommandToV8(WideToUTF16(continue_cmd), new CallerIdWrapper());
}
// static