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

Unified Diff: ash/common/system/user/button_from_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/user/button_from_view.h ('k') | ash/common/system/user/tray_user_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/system/user/button_from_view.cc
diff --git a/ash/common/system/user/button_from_view.cc b/ash/common/system/user/button_from_view.cc
index f1f844be71ea6b0a04438a04ac6665997befb82b..10eaf0a22ab5d4367b2f3f8cedc40e70f15ce809 100644
--- a/ash/common/system/user/button_from_view.cc
+++ b/ash/common/system/user/button_from_view.cc
@@ -10,7 +10,7 @@
#include "ash/common/system/tray/tray_utils.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
-#include "ui/accessibility/ax_view_state.h"
+#include "ui/accessibility/ax_node_data.h"
#include "ui/gfx/canvas.h"
#include "ui/views/background.h"
#include "ui/views/border.h"
@@ -87,12 +87,12 @@ void ButtonFromView::OnBlur() {
SchedulePaint();
}
-void ButtonFromView::GetAccessibleState(ui::AXViewState* state) {
- state->role = ui::AX_ROLE_BUTTON;
+void ButtonFromView::GetAccessibleNodeData(ui::AXNodeData* node_data) {
+ node_data->role = ui::AX_ROLE_BUTTON;
std::vector<base::string16> labels;
for (int i = 0; i < child_count(); ++i)
GetAccessibleLabelFromDescendantViews(child_at(i), labels);
- state->name = base::JoinString(labels, base::ASCIIToUTF16(" "));
+ node_data->SetName(base::JoinString(labels, base::ASCIIToUTF16(" ")));
}
void ButtonFromView::ShowActive() {
« no previous file with comments | « ash/common/system/user/button_from_view.h ('k') | ash/common/system/user/tray_user_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698