summaryrefslogtreecommitdiffstats
path: root/views/touchui
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-19 16:52:40 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-19 16:52:40 +0000
commit33a968691cf644692428f2b59478479db6376e0e (patch)
tree61e5d9967fc7b88efd14c2c54c574d1cd6165b4c /views/touchui
parent0472d93e6feea49df59caadb7ab849a9599f916f (diff)
downloadchromium_src-33a968691cf644692428f2b59478479db6376e0e.zip
chromium_src-33a968691cf644692428f2b59478479db6376e0e.tar.gz
chromium_src-33a968691cf644692428f2b59478479db6376e0e.tar.bz2
views: Change TextButton API to string16.
BUG=68267 R=sky@chromium.org Review URL: http://codereview.chromium.org/8346013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106302 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/touchui')
-rw-r--r--views/touchui/touch_selection_controller_impl.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/views/touchui/touch_selection_controller_impl.cc b/views/touchui/touch_selection_controller_impl.cc
index 16e51e8..6ce527e 100644
--- a/views/touchui/touch_selection_controller_impl.cc
+++ b/views/touchui/touch_selection_controller_impl.cc
@@ -299,8 +299,8 @@ class TouchSelectionControllerImpl::TouchContextMenuView
for (size_t i = 0; i < arraysize(kContextMenuCommands); i++) {
int command_id = kContextMenuCommands[i];
if (controller_->IsCommandIdEnabled(command_id)) {
- TextButton* button = new TextButton(this,
- UTF16ToWide(l10n_util::GetStringUTF16(command_id)));
+ TextButton* button = new TextButton(
+ this, l10n_util::GetStringUTF16(command_id));
button->set_focusable(true);
button->set_request_focus_on_press(false);
button->set_prefix_type(TextButton::PREFIX_HIDE);