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

Unified Diff: chrome/browser/ui/views/website_settings/permission_selector_row.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
Index: chrome/browser/ui/views/website_settings/permission_selector_row.cc
diff --git a/chrome/browser/ui/views/website_settings/permission_selector_row.cc b/chrome/browser/ui/views/website_settings/permission_selector_row.cc
index 95c82b83d773b4c62caa077855a8402ebbaafaf7..a5792608069330abb39ce653fde76cf59828a7d1 100644
--- a/chrome/browser/ui/views/website_settings/permission_selector_row.cc
+++ b/chrome/browser/ui/views/website_settings/permission_selector_row.cc
@@ -11,7 +11,7 @@
#include "chrome/browser/ui/website_settings/permission_menu_model.h"
#include "chrome/browser/ui/website_settings/website_settings_ui.h"
#include "chrome/grit/generated_resources.h"
-#include "ui/accessibility/ax_view_state.h"
+#include "ui/accessibility/ax_node_data.h"
#include "ui/base/material_design/material_design_controller.h"
#include "ui/base/models/combobox_model.h"
#include "ui/gfx/image/image.h"
@@ -48,7 +48,7 @@ class PermissionMenuButton : public views::MenuButton,
~PermissionMenuButton() override;
// Overridden from views::View.
- void GetAccessibleState(ui::AXViewState* state) override;
+ void GetAccessibleNodeData(ui::AXNodeData* node_data) override;
void OnNativeThemeChanged(const ui::NativeTheme* theme) override;
private:
@@ -88,9 +88,9 @@ PermissionMenuButton::PermissionMenuButton(const base::string16& text,
PermissionMenuButton::~PermissionMenuButton() {
}
-void PermissionMenuButton::GetAccessibleState(ui::AXViewState* state) {
- MenuButton::GetAccessibleState(state);
- state->value = GetText();
+void PermissionMenuButton::GetAccessibleNodeData(ui::AXNodeData* node_data) {
+ MenuButton::GetAccessibleNodeData(node_data);
+ node_data->SetValue(GetText());
}
void PermissionMenuButton::OnNativeThemeChanged(const ui::NativeTheme* theme) {

Powered by Google App Engine
This is Rietveld 408576698