Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(24)

Unified Diff: ui/views/controls/button/menu_button.cc

Issue 2477463003: Replace ui::AXViewState with AXNodeData and AXActionData (Closed)
Patch Set: Fix test Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/controls/button/menu_button.h ('k') | ui/views/controls/button/radio_button.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/button/menu_button.cc
diff --git a/ui/views/controls/button/menu_button.cc b/ui/views/controls/button/menu_button.cc
index 38fc310aa6246e9d9d260cf97c04b816ec265a9d..509cfae01a0709824743ad62735f270f9a82f6fe 100644
--- a/ui/views/controls/button/menu_button.cc
+++ b/ui/views/controls/button/menu_button.cc
@@ -5,7 +5,7 @@
#include "ui/views/controls/button/menu_button.h"
#include "base/strings/utf_string_conversions.h"
-#include "ui/accessibility/ax_view_state.h"
+#include "ui/accessibility/ax_node_data.h"
#include "ui/base/dragdrop/drag_drop_types.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/resource/resource_bundle.h"
@@ -297,11 +297,12 @@ bool MenuButton::OnKeyReleased(const ui::KeyEvent& event) {
return false;
}
-void MenuButton::GetAccessibleState(ui::AXViewState* state) {
- CustomButton::GetAccessibleState(state);
- state->role = ui::AX_ROLE_POP_UP_BUTTON;
- state->default_action = l10n_util::GetStringUTF16(IDS_APP_ACCACTION_PRESS);
- state->AddStateFlag(ui::AX_STATE_HASPOPUP);
+void MenuButton::GetAccessibleNodeData(ui::AXNodeData* node_data) {
+ CustomButton::GetAccessibleNodeData(node_data);
+ node_data->role = ui::AX_ROLE_POP_UP_BUTTON;
+ node_data->AddStringAttribute(
+ ui::AX_ATTR_ACTION, l10n_util::GetStringUTF8(IDS_APP_ACCACTION_PRESS));
+ node_data->AddStateFlag(ui::AX_STATE_HASPOPUP);
}
void MenuButton::PaintMenuMarker(gfx::Canvas* canvas) {
« no previous file with comments | « ui/views/controls/button/menu_button.h ('k') | ui/views/controls/button/radio_button.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698