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

Unified Diff: ash/common/system/tray/hover_highlight_view.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 | « ash/common/system/tray/hover_highlight_view.h ('k') | ash/common/system/tray/tray_background_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/system/tray/hover_highlight_view.cc
diff --git a/ash/common/system/tray/hover_highlight_view.cc b/ash/common/system/tray/hover_highlight_view.cc
index 73a9ec8f102be4acc5a13beab3719ed073389441..e0b0e20afb7f9d3e65dfa5c2e70c9934df1f962c 100644
--- a/ash/common/system/tray/hover_highlight_view.cc
+++ b/ash/common/system/tray/hover_highlight_view.cc
@@ -7,7 +7,7 @@
#include "ash/common/system/tray/fixed_sized_image_view.h"
#include "ash/common/system/tray/tray_constants.h"
#include "ash/common/system/tray/view_click_listener.h"
-#include "ui/accessibility/ax_view_state.h"
+#include "ui/accessibility/ax_node_data.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/gfx/canvas.h"
#include "ui/gfx/font_list.h"
@@ -221,16 +221,16 @@ bool HoverHighlightView::PerformAction(const ui::Event& event) {
return true;
}
-void HoverHighlightView::GetAccessibleState(ui::AXViewState* state) {
- ActionableView::GetAccessibleState(state);
+void HoverHighlightView::GetAccessibleNodeData(ui::AXNodeData* node_data) {
+ ActionableView::GetAccessibleNodeData(node_data);
if (accessibility_state_ == AccessibilityState::CHECKED_CHECKBOX ||
accessibility_state_ == AccessibilityState::UNCHECKED_CHECKBOX) {
- state->role = ui::AX_ROLE_CHECK_BOX;
+ node_data->role = ui::AX_ROLE_CHECK_BOX;
}
if (accessibility_state_ == AccessibilityState::CHECKED_CHECKBOX)
- state->AddStateFlag(ui::AX_STATE_CHECKED);
+ node_data->AddStateFlag(ui::AX_STATE_CHECKED);
}
gfx::Size HoverHighlightView::GetPreferredSize() const {
« no previous file with comments | « ash/common/system/tray/hover_highlight_view.h ('k') | ash/common/system/tray/tray_background_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698