diff options
author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-14 18:34:56 +0000 |
---|---|---|
committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-14 18:34:56 +0000 |
commit | 001f08ab3184a370fdd1e8cf4cef05fa15174bd9 (patch) | |
tree | 2d808b05a8f8294af7346c0e7f8af472266023e1 /views/controls/button/button.h | |
parent | 6784252af99d1da6c63871374d9409998c64ef5b (diff) | |
download | chromium_src-001f08ab3184a370fdd1e8cf4cef05fa15174bd9.zip chromium_src-001f08ab3184a370fdd1e8cf4cef05fa15174bd9.tar.gz chromium_src-001f08ab3184a370fdd1e8cf4cef05fa15174bd9.tar.bz2 |
Remove wstring from views. Part 3: Switch accessibility strings to string16.
BUG=68267
TEST=no visible changes; all tests pass
Review URL: http://codereview.chromium.org/6192007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71461 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls/button/button.h')
-rw-r--r-- | views/controls/button/button.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/views/controls/button/button.h b/views/controls/button/button.h index 0f9eb9d..263e45f 100644 --- a/views/controls/button/button.h +++ b/views/controls/button/button.h @@ -39,9 +39,10 @@ class Button : public View { void SetAccessibleKeyboardShortcut(const std::wstring& shortcut); // Overridden from View: - virtual bool GetTooltipText(const gfx::Point& p, std::wstring* tooltip); - virtual std::wstring GetAccessibleKeyboardShortcut(); - virtual AccessibilityTypes::Role GetAccessibleRole(); + virtual bool GetTooltipText(const gfx::Point& p, + std::wstring* tooltip) OVERRIDE; + virtual string16 GetAccessibleKeyboardShortcut() OVERRIDE; + virtual AccessibilityTypes::Role GetAccessibleRole() OVERRIDE; protected: // Construct the Button with a Listener. The listener can be NULL. This can be |