a11y: Exclude children of nested keyboard accessible controls from a11y tree.

ui/views/accessibility/native_view_accessibility.h

 // 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.
 
 #ifndef UI_VIEWS_ACCESSIBILITY_NATIVE_VIEW_ACCESSIBILITY_H_
 #define UI_VIEWS_ACCESSIBILITY_NATIVE_VIEW_ACCESSIBILITY_H_
 
+#include <map>
+
 #include "base/macros.h"
 #include "build/build_config.h"
 #include "ui/accessibility/ax_action_data.h"
 #include "ui/accessibility/ax_node_data.h"
 #include "ui/accessibility/platform/ax_platform_node.h"
 #include "ui/accessibility/platform/ax_platform_node_delegate.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/views/views_export.h"
 #include "ui/views/widget/widget_observer.h"
 
@@ skipping 11 matching lines @@
 
 namespace views {
 
 class View;
 class Widget;
 
 class VIEWS_EXPORT NativeViewAccessibility
     : public ui::AXPlatformNodeDelegate,
       public WidgetObserver {
  public:
-  static NativeViewAccessibility* Create(View* view);
+  static NativeViewAccessibility* GetOrCreate(View* view);
+
+  ~NativeViewAccessibility() override;
 
   gfx::NativeViewAccessible GetNativeObject();
 
-  // Call Destroy rather than deleting this, because the subclass may
-  // use reference counting.
-  virtual void Destroy();
-
   void NotifyAccessibilityEvent(ui::AXEvent event_type);
 
   // Focuses or unfocuses a View.
   bool SetFocused(bool focused);
 
   // ui::AXPlatformNodeDelegate
   const ui::AXNodeData& GetData() override;
   int GetChildCount() override;
   gfx::NativeViewAccessible ChildAtIndex(int index) override;
   gfx::NativeWindow GetTopLevelWidget() override;
   gfx::NativeViewAccessible GetParent() override;
   gfx::Vector2d GetGlobalCoordinateOffset() override;
   gfx::NativeViewAccessible HitTestSync(int x, int y) override;
   gfx::NativeViewAccessible GetFocus() override;
   gfx::AcceleratedWidget GetTargetForNativeAccessibilityEvent() override;
   bool AccessibilityPerformAction(const ui::AXActionData& data) override;
   void DoDefaultAction() override;
 
   // WidgetObserver
   void OnWidgetDestroying(Widget* widget) override;
 
   Widget* parent_widget() const { return parent_widget_; }
   void SetParentWidget(Widget* parent_widget);
 
  protected:
   NativeViewAccessibility(View* view);
-  ~NativeViewAccessibility() override;
 
   // Weak. Owns this.
   View* view_;
 
   // Weak. Uses WidgetObserver to clear. This is set on the root view for
   // a widget that's owned by another widget, so we can walk back up the
   // tree.
   Widget* parent_widget_;
 
  private:
+  // A static map from every View to its associated NativeViewAccessibility.
+  typedef std::map<View*, NativeViewAccessibility*> NativeViewAccessibilityMap;

[tapted, 2017/01/11 18:27:39]

can this (and the <map> #include) move into the .cc file as well? (actually I
think the typedef has already, so we can just move the comment perhaps)

[Patti Lor, 2017/02/21 03:29:16]

Deleted as no longer needed :) Thanks for your suggestions Trent!

+
+  // Creates new platform-specific NativeViewAccessibility subclass instances.
+  static NativeViewAccessibility* Create(View* view);
+
   void PopulateChildWidgetVector(std::vector<Widget*>* result_child_widgets);
 
   // We own this, but it is reference-counted on some platforms so we can't use
   // a scoped_ptr. It is dereferenced in the destructor.
   ui::AXPlatformNode* ax_node_;
 
   ui::AXNodeData data_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeViewAccessibility);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_ACCESSIBILITY_NATIVE_VIEW_ACCESSIBILITY_H_