From 8cdb6ebf7304ea36430e95d857218b07266e3173 Mon Sep 17 00:00:00 2001 From: "tfarina@chromium.org" Date: Mon, 3 Oct 2011 14:43:12 +0000 Subject: views: Change MenuDelegate::GetLabel() to string16. BUG=68267 R=sky@chromium.org Review URL: http://codereview.chromium.org/8095012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103710 0039d316-1c4b-4281-b951-d872f2087c98 --- views/controls/menu/menu.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'views/controls/menu/menu.h') diff --git a/views/controls/menu/menu.h b/views/controls/menu/menu.h index a6e3971..83b374f 100644 --- a/views/controls/menu/menu.h +++ b/views/controls/menu/menu.h @@ -9,6 +9,7 @@ #include #include "base/basictypes.h" +#include "base/string16.h" #include "ui/gfx/native_widget_types.h" #include "views/views_export.h" @@ -48,8 +49,8 @@ class VIEWS_EXPORT Menu { } // The string shown for the menu item. - virtual std::wstring GetLabel(int id) const { - return std::wstring(); + virtual string16 GetLabel(int id) const { + return string16(); } // The delegate needs to implement this function if it wants to display -- cgit v1.1