summaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-20 00:43:17 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-20 00:43:17 +0000
commit4cad742a03d30387a9ac9886b54671728b7664c4 (patch)
tree6cea5001249ae90bfb59a446c2d7aeec896219ad /ui
parent08b043736c1b650ab171178696fdcdd055525b5c (diff)
downloadchromium_src-4cad742a03d30387a9ac9886b54671728b7664c4.zip
chromium_src-4cad742a03d30387a9ac9886b54671728b7664c4.tar.gz
chromium_src-4cad742a03d30387a9ac9886b54671728b7664c4.tar.bz2
views: Change MenuItemView API to string16.
BUG=68267 R=sky@chromium.org Review URL: http://codereview.chromium.org/8352015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106421 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
-rw-r--r--ui/aura_shell/examples/window_type_launcher.cc7
1 files changed, 5 insertions, 2 deletions
diff --git a/ui/aura_shell/examples/window_type_launcher.cc b/ui/aura_shell/examples/window_type_launcher.cc
index fdbdb12..a58d975 100644
--- a/ui/aura_shell/examples/window_type_launcher.cc
+++ b/ui/aura_shell/examples/window_type_launcher.cc
@@ -151,8 +151,11 @@ void WindowTypeLauncher::ShowContextMenuForView(views::View* source,
const gfx::Point& p,
bool is_mouse_gesture) {
MenuItemView* root = new MenuItemView(this);
- root->AppendMenuItem(COMMAND_NEW_WINDOW, L"New Window", MenuItemView::NORMAL);
- root->AppendMenuItem(COMMAND_TOGGLE_FULLSCREEN, L"Toggle FullScreen",
+ root->AppendMenuItem(COMMAND_NEW_WINDOW,
+ ASCIIToUTF16("New Window"),
+ MenuItemView::NORMAL);
+ root->AppendMenuItem(COMMAND_TOGGLE_FULLSCREEN,
+ ASCIIToUTF16("Toggle FullScreen"),
MenuItemView::NORMAL);
// MenuRunner takes ownership of root.
menu_runner_.reset(new MenuRunner(root));