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

Unified Diff: ui/views/controls/button/custom_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/custom_button.h ('k') | ui/views/controls/button/image_button.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/button/custom_button.cc
diff --git a/ui/views/controls/button/custom_button.cc b/ui/views/controls/button/custom_button.cc
index 73d94ebe39b067ee674297e0a06b1dac78a0e4ba..2952a7456621cefe62f15a32ab2a013b8c10d5d0 100644
--- a/ui/views/controls/button/custom_button.cc
+++ b/ui/views/controls/button/custom_button.cc
@@ -4,7 +4,7 @@
#include "ui/views/controls/button/custom_button.h"
-#include "ui/accessibility/ax_view_state.h"
+#include "ui/accessibility/ax_node_data.h"
#include "ui/events/event.h"
#include "ui/events/event_utils.h"
#include "ui/events/keycodes/keyboard_codes.h"
@@ -330,21 +330,21 @@ void CustomButton::OnDragDone() {
AnimateInkDrop(InkDropState::HIDDEN, nullptr /* event */);
}
-void CustomButton::GetAccessibleState(ui::AXViewState* state) {
- Button::GetAccessibleState(state);
+void CustomButton::GetAccessibleNodeData(ui::AXNodeData* node_data) {
+ Button::GetAccessibleNodeData(node_data);
switch (state_) {
case STATE_HOVERED:
- state->AddStateFlag(ui::AX_STATE_HOVERED);
+ node_data->AddStateFlag(ui::AX_STATE_HOVERED);
break;
case STATE_PRESSED:
- state->AddStateFlag(ui::AX_STATE_PRESSED);
+ node_data->AddStateFlag(ui::AX_STATE_PRESSED);
break;
case STATE_DISABLED:
- state->AddStateFlag(ui::AX_STATE_DISABLED);
+ node_data->AddStateFlag(ui::AX_STATE_DISABLED);
break;
case STATE_NORMAL:
case STATE_COUNT:
- // No additional accessibility state set for this button state.
+ // No additional accessibility node_data set for this button node_data.
break;
}
}
« no previous file with comments | « ui/views/controls/button/custom_button.h ('k') | ui/views/controls/button/image_button.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698