diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-12 23:40:40 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-12 23:40:40 +0000 |
| commit | 1abede9a1dcf4cdbb27c95d247f41733d21ba208 (patch) | |
| tree | 42ec2f654e839ff7ea954e3d3dc8c2536c95c68b /views/controls | |
| parent | 959abf3b1fdbf58974eebe7e42490c2c3ff3e504 (diff) | |
| download | chromium_src-1abede9a1dcf4cdbb27c95d247f41733d21ba208.zip chromium_src-1abede9a1dcf4cdbb27c95d247f41733d21ba208.tar.gz chromium_src-1abede9a1dcf4cdbb27c95d247f41733d21ba208.tar.bz2 | |
views: Change MenuButton API to string16.
BUG=68267
R=sky@chromium.org
Review URL: http://codereview.chromium.org/8245013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105196 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls')
| -rw-r--r-- | views/controls/button/menu_button.cc | 4 | ||||
| -rw-r--r-- | views/controls/button/menu_button.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/views/controls/button/menu_button.cc b/views/controls/button/menu_button.cc index b8d0410..4a9e74c 100644 --- a/views/controls/button/menu_button.cc +++ b/views/controls/button/menu_button.cc @@ -46,10 +46,10 @@ const char MenuButton::kViewClassName[] = "views/MenuButton"; //////////////////////////////////////////////////////////////////////////////// MenuButton::MenuButton(ButtonListener* listener, - const std::wstring& text, + const string16& text, ViewMenuDelegate* menu_delegate, bool show_menu_marker) - : TextButton(listener, text), + : TextButton(listener, UTF16ToWideHack(text)), menu_visible_(false), menu_offset_(kDefaultMenuOffsetX, kDefaultMenuOffsetY), menu_delegate_(menu_delegate), diff --git a/views/controls/button/menu_button.h b/views/controls/button/menu_button.h index ce84526..5f202cb 100644 --- a/views/controls/button/menu_button.h +++ b/views/controls/button/menu_button.h @@ -8,6 +8,7 @@ #include <string> +#include "base/string16.h" #include "base/time.h" #include "ui/gfx/font.h" #include "views/background.h" @@ -28,12 +29,11 @@ class ViewMenuDelegate; //////////////////////////////////////////////////////////////////////////////// class VIEWS_EXPORT MenuButton : public TextButton { public: - // The menu button's class name. static const char kViewClassName[]; // Create a Button. MenuButton(ButtonListener* listener, - const std::wstring& text, + const string16& text, ViewMenuDelegate* menu_delegate, bool show_menu_marker); virtual ~MenuButton(); |