Mac a11y: Add Help, TopLevelUIElement, and Window accessibility attributes.

ui/views/accessibility/native_view_accessibility.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/accessibility/native_view_accessibility.h"
 
 #include "base/strings/utf_string_conversions.h"
 #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"
 
 namespace views {
 
 #if !defined(PLATFORM_HAS_NATIVE_VIEW_ACCESSIBILITY_IMPL)
 // static
 NativeViewAccessibility* NativeViewAccessibility::Create(View* view) {
   return new NativeViewAccessibility(view);
@@ skipping 37 matching lines @@
   data_.state = state.state();
   data_.location = view_->GetBoundsInScreen();
   data_.AddStringAttribute(ui::AX_ATTR_NAME, base::UTF16ToUTF8(state.name));
   data_.AddStringAttribute(ui::AX_ATTR_VALUE, base::UTF16ToUTF8(state.value));
   data_.AddStringAttribute(ui::AX_ATTR_ACTION,
                            base::UTF16ToUTF8(state.default_action));
   data_.AddStringAttribute(ui::AX_ATTR_SHORTCUT,
                            base::UTF16ToUTF8(state.keyboard_shortcut));
   data_.AddStringAttribute(ui::AX_ATTR_PLACEHOLDER,
                            base::UTF16ToUTF8(state.placeholder));
+
+  if (view_->GetTooltipText(gfx::Point(), &state.help_text))

[tapted, 2016/07/18 03:38:48]

passing gfx::Point() might not work for the bookmarks bar or task manager
(tableview), but I think this is OK - they only use tooltips for truncated
strings, so there so there should be a better field already

[Patti Lor, 2016/07/19 01:14:10]

Have double checked this and you are right - both have their accessibilityTitle
set to the full text. I'm not sure if the truncating applies though - I see
elided text in the tooltip for bookmark buttons but the accessibilityHelp is
also the full string (same as accessibilityTitle). The task manager rows on the
other hand don't have tooltips at all (but their accessibilityTitle is set).

Either way it should be fine :)

[tapted, 2016/07/19 03:22:50]

Acknowledged. Yeah I only had a skim of the bookmarks bar / tableview code since
they make use of the |point| argument, but I'm not sure how the a11y hit test
will map - probably fine for a follow-up if we find an error

[Patti Lor, 2016/07/19 05:29:24]

I checked this using the XCode Accessibility Inspector, so hit tests for task
manager rows are fine. But I had to dig around a bit for the bookmark bar
buttons, but I think that will be fixed when http://crbug.com/610589 (hiding
labels inside LabelButtons from the a11y tree) is fixed.

+    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);
 
   data_.state |= (1 << ui::AX_STATE_FOCUSABLE);
 
   if (!view_->enabled())
     data_.state |= (1 << ui::AX_STATE_DISABLED);
 
   if (!view_->visible())
     data_.state |= (1 << ui::AX_STATE_INVISIBLE);
@@ skipping 20 matching lines @@
   if (index < view_->child_count()) {
     return view_->child_at(index)->GetNativeViewAccessible();
   } else if (index < view_->child_count() + child_widget_count) {
     Widget* child_widget = child_widgets[index - view_->child_count()];
     return child_widget->GetRootView()->GetNativeViewAccessible();
   }
 
   return nullptr;
 }
 
+gfx::NativeWindow NativeViewAccessibility::GetTopLevelWidget() {
+  return view_->GetWidget()->GetTopLevelWidget()->GetNativeWindow();

[tapted, 2016/07/19 03:22:50]

oops - I thought I'd written a comment here but I might have gotten distracted
by GetParent(). I think this should check `view_->GetWidget()` first to ensure
it's non-null (like GetParent does)

[Patti Lor, 2016/07/19 05:29:24]

Done, thank you.

+}
+
 gfx::NativeViewAccessible NativeViewAccessibility::GetParent() {
   if (view_->parent())
     return view_->parent()->GetNativeViewAccessible();
 
   // TODO: move this to NativeViewAccessibilityMac.

[tapted, 2016/07/18 03:38:48]

do we need to do something with this? (or is there a way to leverage GetParent()
rather than adding a separate GetTopLevelWidget()?

[Patti Lor, 2016/07/19 01:14:10]

NativeViewAccessibilityMac doesn't exist yet, so I think if we want to get rid
of this TODO it probably belongs in a new CL.

Using GetParent() is more promising, I thought about using it but rejected that
because I couldn't find anything that indicated that the top level widget
wouldn't be skipped somehow. E.g., if |view_| was a bubble (which qualifies as a
top level widget (see
https://cs.chromium.org/chromium/src/ui/views/widget/widget.h?type=cs&sq=pack...),
but bubbles also usually have a parent/owning widget), then the top level widget
would be |view_| and not the bubble parent. GetParent() seems to return the
latter, in which case calling GetTopLevelWidget() on that would return the top
level widget associated with the bubble parent which is wrong. So I don't think
GetParent() is useful here, but let me know if you think otherwise (or if you
were thinking of a different method of using GetParent() entirely).

[tapted, 2016/07/19 03:22:50]

Acknowledged.

 #if defined(OS_MACOSX)
   if (view_->GetWidget())
     return view_->GetWidget()->GetNativeView();
 #endif
 
   if (parent_widget_)
     return parent_widget_->GetRootView()->GetNativeViewAccessible();
 
   return nullptr;
 }
@@ skipping 122 matching lines @@
               child_widget_platform_node->GetDelegate());
       if (child_widget_view_accessibility->parent_widget() != widget)
         child_widget_view_accessibility->SetParentWidget(widget);
     }
 
     result_child_widgets->push_back(child_widget);
   }
 }
 
 }  // namespace views