diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-13 22:02:34 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-13 22:02:34 +0000 |
| commit | 144199d5848b185b9e7f3f73374bde01eefeedb7 (patch) | |
| tree | 8dfad57ce2d13502802c81d25e9a751905ac665e /webkit/tools | |
| parent | a8f914871101974a4856248630c08454b7a7d294 (diff) | |
| download | chromium_src-144199d5848b185b9e7f3f73374bde01eefeedb7.zip chromium_src-144199d5848b185b9e7f3f73374bde01eefeedb7.tar.gz chromium_src-144199d5848b185b9e7f3f73374bde01eefeedb7.tar.bz2 | |
revert r16006 due to msvc warning.
TBR=playmobil
Review URL: http://codereview.chromium.org/113367
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16007 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools')
| -rw-r--r-- | webkit/tools/test_shell/text_input_controller.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/webkit/tools/test_shell/text_input_controller.cc b/webkit/tools/test_shell/text_input_controller.cc index a371881..121d9a9 100644 --- a/webkit/tools/test_shell/text_input_controller.cc +++ b/webkit/tools/test_shell/text_input_controller.cc @@ -4,7 +4,6 @@ #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" @@ -51,7 +50,7 @@ void TextInputController::insertText( return; if (args.size() >= 1 && args[0].isString()) { - text_input->InsertText(UTF8ToUTF16(args[0].ToString())); + text_input->InsertText(args[0].ToString()); } } @@ -64,7 +63,7 @@ void TextInputController::doCommand( return; if (args.size() >= 1 && args[0].isString()) { - text_input->DoCommand(UTF8ToUTF16(args[0].ToString())); + text_input->DoCommand(args[0].ToString()); } } @@ -78,7 +77,7 @@ void TextInputController::setMarkedText( if (args.size() >= 3 && args[0].isString() && args[1].isNumber() && args[2].isNumber()) { - text_input->SetMarkedText(UTF8ToUTF16(args[0].ToString()), + text_input->SetMarkedText(args[0].ToString(), args[1].ToInt32(), args[2].ToInt32()); } |