diff options
| author | dmazzoni@chromium.org <dmazzoni@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-03 23:13:49 +0000 |
|---|---|---|
| committer | dmazzoni@chromium.org <dmazzoni@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-03 23:13:49 +0000 |
| commit | c45dde3c15cddbca7795cab1c28fa472148b01b1 (patch) | |
| tree | 74f32f6537b87946703839e7e2dfde2f2a2f9063 /views/controls/button/menu_button.cc | |
| parent | 7c8f18ab4383e497f0ba3663156abf81ea5af3e6 (diff) | |
| download | chromium_src-c45dde3c15cddbca7795cab1c28fa472148b01b1.zip chromium_src-c45dde3c15cddbca7795cab1c28fa472148b01b1.tar.gz chromium_src-c45dde3c15cddbca7795cab1c28fa472148b01b1.tar.bz2 | |
Refactor Views accessibility.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/6581010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76825 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls/button/menu_button.cc')
| -rw-r--r-- | views/controls/button/menu_button.cc | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/views/controls/button/menu_button.cc b/views/controls/button/menu_button.cc index f88b106..db138bb 100644 --- a/views/controls/button/menu_button.cc +++ b/views/controls/button/menu_button.cc @@ -7,6 +7,7 @@ #include "base/utf_string_conversions.h" #include "grit/app_strings.h" #include "grit/app_resources.h" +#include "ui/base/accessibility/accessible_view_state.h" #include "ui/base/dragdrop/drag_drop_types.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" @@ -260,16 +261,11 @@ void MenuButton::OnMouseExited(const MouseEvent& event) { // //////////////////////////////////////////////////////////////////////////////// -string16 MenuButton::GetAccessibleDefaultAction() { - return l10n_util::GetStringUTF16(IDS_APP_ACCACTION_PRESS); -} - -AccessibilityTypes::Role MenuButton::GetAccessibleRole() { - return AccessibilityTypes::ROLE_BUTTONMENU; -} - -AccessibilityTypes::State MenuButton::GetAccessibleState() { - return AccessibilityTypes::STATE_HASPOPUP; +void MenuButton::GetAccessibleState(ui::AccessibleViewState* state) { + CustomButton::GetAccessibleState(state); + state->role = ui::AccessibilityTypes::ROLE_BUTTONMENU; + state->default_action = l10n_util::GetStringUTF16(IDS_APP_ACCACTION_PRESS); + state->state = ui::AccessibilityTypes::STATE_HASPOPUP; } std::string MenuButton::GetClassName() const { |