From 11274acf1fb8f62103f69a7783fc5f9b9fce9df3 Mon Sep 17 00:00:00 2001
From: "yurys@google.com"
 <yurys@google.com@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Thu, 21 May 2009 16:02:20 +0000
Subject: 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
---
 webkit/glue/devtools/debugger_agent_manager.cc | 6 +++---
 webkit/glue/devtools/debugger_agent_manager.h  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'webkit/glue')

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
diff --git a/webkit/glue/devtools/debugger_agent_manager.h b/webkit/glue/devtools/debugger_agent_manager.h
index e0774bb..61f1e69 100644
--- a/webkit/glue/devtools/debugger_agent_manager.h
+++ b/webkit/glue/devtools/debugger_agent_manager.h
@@ -57,7 +57,7 @@ class DebuggerAgentManager {
 
   static void V8DebugHostDispatchHandler();
   static void OnV8DebugMessage(const v8::Debug::Message& message);
-  static void SendCommandToV8(const std::wstring& cmd,
+  static void SendCommandToV8(const string16& cmd,
                               v8::Debug::ClientData* data);
   static void SendContinueCommandToV8();
 
-- 
cgit v1.1