diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-03 14:43:12 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-03 14:43:12 +0000 |
| commit | 8cdb6ebf7304ea36430e95d857218b07266e3173 (patch) | |
| tree | ee2f6da13c9c009670b8be600bce9bfb2961280c /views/controls/menu/menu.h | |
| parent | 76baa6519e3a55375efc583f189ab16d74153d84 (diff) | |
| download | chromium_src-8cdb6ebf7304ea36430e95d857218b07266e3173.zip chromium_src-8cdb6ebf7304ea36430e95d857218b07266e3173.tar.gz chromium_src-8cdb6ebf7304ea36430e95d857218b07266e3173.tar.bz2 | |
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
Diffstat (limited to 'views/controls/menu/menu.h')
| -rw-r--r-- | views/controls/menu/menu.h | 5 |
1 files changed, 3 insertions, 2 deletions
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 <string> #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 |