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 = gfx::RectF(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 (state.description.empty() &&
+      view_->GetTooltipText(gfx::Point(), &state.description))
+    data_.AddStringAttribute(ui::AX_ATTR_DESCRIPTION,
+                             base::UTF16ToUTF8(state.description));
+
   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() {
+  if (view_->GetWidget())
+    return view_->GetWidget()->GetTopLevelWidget()->GetNativeWindow();
+  return nullptr;
+}
+
 gfx::NativeViewAccessible NativeViewAccessibility::GetParent() {
   if (view_->parent())
     return view_->parent()->GetNativeViewAccessible();
 
   // TODO: move this to NativeViewAccessibilityMac.
 #if defined(OS_MACOSX)
   if (view_->GetWidget())
     return view_->GetWidget()->GetNativeView();
 #endif
 
@@ skipping 127 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