summaryrefslogtreecommitdiffstats
path: root/webkit/tools/test_shell
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-14 01:05:27 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-14 01:05:27 +0000
commit7be0e1710c92420e5b15b3d0d1850a09848cf217 (patch)
tree2e78a8d47b62abcf752b502aeefe3ca01cade638 /webkit/tools/test_shell
parent7912282690d4ec3a0a408af669febb4db0930119 (diff)
downloadchromium_src-7be0e1710c92420e5b15b3d0d1850a09848cf217.zip
chromium_src-7be0e1710c92420e5b15b3d0d1850a09848cf217.tar.gz
chromium_src-7be0e1710c92420e5b15b3d0d1850a09848cf217.tar.bz2
Retry r16006.
Review URL: http://codereview.chromium.org/113369 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16025 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell')
-rw-r--r--webkit/tools/test_shell/text_input_controller.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/webkit/tools/test_shell/text_input_controller.cc b/webkit/tools/test_shell/text_input_controller.cc
index 121d9a9..a371881 100644
--- a/webkit/tools/test_shell/text_input_controller.cc
+++ b/webkit/tools/test_shell/text_input_controller.cc
@@ -4,6 +4,7 @@
#include "webkit/tools/test_shell/text_input_controller.h"
+#include "base/string_util.h"
#include "webkit/glue/webview.h"
#include "webkit/glue/webframe.h"
#include "webkit/glue/webtextinput.h"
@@ -50,7 +51,7 @@ void TextInputController::insertText(
return;
if (args.size() >= 1 && args[0].isString()) {
- text_input->InsertText(args[0].ToString());
+ text_input->InsertText(UTF8ToUTF16(args[0].ToString()));
}
}
@@ -63,7 +64,7 @@ void TextInputController::doCommand(
return;
if (args.size() >= 1 && args[0].isString()) {
- text_input->DoCommand(args[0].ToString());
+ text_input->DoCommand(UTF8ToUTF16(args[0].ToString()));
}
}
@@ -77,7 +78,7 @@ void TextInputController::setMarkedText(
if (args.size() >= 3 && args[0].isString()
&& args[1].isNumber() && args[2].isNumber()) {
- text_input->SetMarkedText(args[0].ToString(),
+ text_input->SetMarkedText(UTF8ToUTF16(args[0].ToString()),
args[1].ToInt32(),
args[2].ToInt32());
}