summaryrefslogtreecommitdiffstats
path: root/views/controls/button/button.cc
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-14 18:34:56 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-14 18:34:56 +0000
commit001f08ab3184a370fdd1e8cf4cef05fa15174bd9 (patch)
tree2d808b05a8f8294af7346c0e7f8af472266023e1 /views/controls/button/button.cc
parent6784252af99d1da6c63871374d9409998c64ef5b (diff)
downloadchromium_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.cc')
-rw-r--r--views/controls/button/button.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/views/controls/button/button.cc b/views/controls/button/button.cc
index a80902d..b59fd89 100644
--- a/views/controls/button/button.cc
+++ b/views/controls/button/button.cc
@@ -33,8 +33,8 @@ bool Button::GetTooltipText(const gfx::Point& p, std::wstring* tooltip) {
return true;
}
-std::wstring Button::GetAccessibleKeyboardShortcut() {
- return UTF16ToWideHack(accessible_shortcut_);
+string16 Button::GetAccessibleKeyboardShortcut() {
+ return accessible_shortcut_;
}
AccessibilityTypes::Role Button::GetAccessibleRole() {