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

Unified Diff: ui/views/accessibility/native_view_accessibility.cc

Issue 2141013004: Mac a11y: Add Help, TopLevelUIElement, and Window accessibility attributes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add null check for NVA::GetTopLevelWidget(). Created 4 years, 5 months 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: ui/views/accessibility/native_view_accessibility.cc
diff --git a/ui/views/accessibility/native_view_accessibility.cc b/ui/views/accessibility/native_view_accessibility.cc
index 0cdec0d150397aec2813046df89fb1e840bc32c4..f1e48dc806e9d6bad6519f9f2adcdf1709832d6c 100644
--- a/ui/views/accessibility/native_view_accessibility.cc
+++ b/ui/views/accessibility/native_view_accessibility.cc
@@ -8,6 +8,7 @@
#include "build/build_config.h"
#include "ui/accessibility/ax_view_state.h"
#include "ui/events/event_utils.h"
+#include "ui/gfx/native_widget_types.h"
#include "ui/views/controls/native/native_view_host.h"
#include "ui/views/view.h"
#include "ui/views/widget/widget.h"
@@ -65,6 +66,11 @@ const ui::AXNodeData& NativeViewAccessibility::GetData() {
base::UTF16ToUTF8(state.keyboard_shortcut));
data_.AddStringAttribute(ui::AX_ATTR_PLACEHOLDER,
base::UTF16ToUTF8(state.placeholder));
+
+ if (view_->GetTooltipText(gfx::Point(), &state.help_text))
+ data_.AddStringAttribute(ui::AX_ATTR_HELP_TEXT,
+ base::UTF16ToUTF8(state.help_text));
+
data_.AddIntAttribute(ui::AX_ATTR_TEXT_SEL_START, state.selection_start);
data_.AddIntAttribute(ui::AX_ATTR_TEXT_SEL_END, state.selection_end);
@@ -105,6 +111,12 @@ gfx::NativeViewAccessible NativeViewAccessibility::ChildAtIndex(int index) {
return nullptr;
}
+gfx::NativeWindow NativeViewAccessibility::GetTopLevelWidget() {
+ if (view_->GetWidget())
+ return view_->GetWidget()->GetTopLevelWidget()->GetNativeWindow();
+ return nullptr;
+}
+
gfx::NativeViewAccessible NativeViewAccessibility::GetParent() {
if (view_->parent())
return view_->parent()->GetNativeViewAccessible();

Powered by Google App Engine
This is Rietveld 408576698