Chromium Code Reviews| Index: chrome/browser/ui/views/website_settings/permission_selector_view.cc |
| diff --git a/chrome/browser/ui/views/website_settings/permission_selector_view.cc b/chrome/browser/ui/views/website_settings/permission_selector_view.cc |
| index 14ef13cdff3e3c41ba55ce59b782768b463baebc..38025b491d618fb27a33fb5e74946fe89c6216a7 100644 |
| --- a/chrome/browser/ui/views/website_settings/permission_selector_view.cc |
| +++ b/chrome/browser/ui/views/website_settings/permission_selector_view.cc |
| @@ -7,6 +7,7 @@ |
| #include "base/utf_string_conversions.h" |
| #include "chrome/browser/ui/website_settings/website_settings_ui.h" |
| #include "grit/generated_resources.h" |
| +#include "ui/base/accessibility/accessible_view_state.h" |
| #include "ui/base/l10n/l10n_util.h" |
| #include "ui/base/models/simple_menu_model.h" |
| #include "ui/gfx/image/image.h" |
| @@ -103,6 +104,9 @@ class PermissionMenuButton : public views::MenuButton, |
| // Overridden from views::TextButton. |
| virtual void SetText(const string16& text) OVERRIDE; |
| + // Overridden from views::View. |
| + virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE; |
| + |
| private: |
| // Overridden from views::MenuButtonListener. |
| virtual void OnMenuButtonClicked(View* source, |
| @@ -220,6 +224,11 @@ void PermissionMenuButton::SetText(const string16& text) { |
| SizeToPreferredSize(); |
| } |
| +void PermissionMenuButton::GetAccessibleState(ui::AccessibleViewState* state) { |
| + MenuButton::GetAccessibleState(state); |
| + state->value = text(); |
| +} |
| + |
| void PermissionMenuButton::OnMenuButtonClicked(View* source, |
| const gfx::Point& point) { |
| views::MenuModelAdapter menu_model_adapter(menu_model_); |
| @@ -307,6 +316,9 @@ PermissionSelectorView::PermissionSelectorView( |
| menu_button_model_.get(), |
| button_enabled); |
| menu_button_->SetEnabled(button_enabled); |
| + menu_button_->set_focusable(true); |
|
msw
2012/09/21 22:32:46
nit: s/true/button_enabled/ ?
markusheintz_
2012/09/24 14:08:31
Done. It actually doesn't matter since the is focu
|
| + menu_button_->SetAccessibleName( |
|
msw
2012/09/21 22:32:46
How are this AccessibleName and the AccessibleView
dmazzoni
2012/09/21 22:45:19
I think this is right. If this is a multiple-choic
|
| + WebsiteSettingsUI::PermissionTypeToUIString(type)); |
| layout->AddView(menu_button_); |
| } |