diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-14 17:15:18 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-14 17:15:18 +0000 |
| commit | 1783bd57b32908571ac610181f0cf1e3b7a3bb45 (patch) | |
| tree | 84a3520038ac732f2f73561a1cac79fd7cecd069 /webkit/tools/test_shell/layout_test_controller.cc | |
| parent | 1823a7b446974dadf23a6f8d0ff85d60c196fa5e (diff) | |
| download | chromium_src-1783bd57b32908571ac610181f0cf1e3b7a3bb45.zip chromium_src-1783bd57b32908571ac610181f0cf1e3b7a3bb45.tar.gz chromium_src-1783bd57b32908571ac610181f0cf1e3b7a3bb45.tar.bz2 | |
webkit: use string16 in webkit_glue.h
And a few places that it touches.
BUG=23581
Review URL: http://codereview.chromium.org/5729005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69147 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell/layout_test_controller.cc')
| -rw-r--r-- | webkit/tools/test_shell/layout_test_controller.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/webkit/tools/test_shell/layout_test_controller.cc b/webkit/tools/test_shell/layout_test_controller.cc index 1918106..3ddfaab 100644 --- a/webkit/tools/test_shell/layout_test_controller.cc +++ b/webkit/tools/test_shell/layout_test_controller.cc @@ -1341,12 +1341,12 @@ void LayoutTestController::counterValueForElementById( result->SetNull(); if (args.size() < 1 || !args[0].isString()) return; - std::wstring counterValue; + string16 counterValue; if (!webkit_glue::CounterValueForElementById(shell_->webView()->mainFrame(), args[0].ToString(), &counterValue)) return; - result->Set(WideToUTF8(counterValue)); + result->Set(UTF16ToUTF8(counterValue)); } static bool ParsePageSizeParameters(const CppArgumentList& args, |