MacViews: Accessibility bridge

ui/views/accessibility/native_view_accessibility.h

Index: ui/views/accessibility/native_view_accessibility.h
diff --git a/ui/views/accessibility/native_view_accessibility.h b/ui/views/accessibility/native_view_accessibility.h
index 2b9f5927710ab92dcb42665bb1dd9b5916706f81..31d01070a2e5e0c29e04c7f6a096bd4ff0d0cf0c 100644
--- a/ui/views/accessibility/native_view_accessibility.h
+++ b/ui/views/accessibility/native_view_accessibility.h
@@ -5,7 +5,9 @@
 #ifndef UI_VIEWS_ACCESSIBILITY_NATIVE_VIEW_ACCESSIBILITY_H_
 #define UI_VIEWS_ACCESSIBILITY_NATIVE_VIEW_ACCESSIBILITY_H_
 
-#include "ui/accessibility/ax_enums.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"
 
@@ -13,13 +15,10 @@ namespace views {
 
 class View;
 
-class VIEWS_EXPORT NativeViewAccessibility {
+class VIEWS_EXPORT NativeViewAccessibility : public ui::AXPlatformNodeDelegate {
  public:
   static NativeViewAccessibility* Create(View* view);
 
-  virtual void NotifyAccessibilityEvent(
-      ui::AXEvent event_type) {}
-
   virtual gfx::NativeViewAccessible GetNativeObject();
 
   // Call Destroy rather than deleting this, because the subclass may
@@ -32,11 +31,23 @@ class VIEWS_EXPORT NativeViewAccessibility {
   static void RegisterWebView(View* web_view);
   static void UnregisterWebView(View* web_view);
 
+  // ui::AXPlatformNodeDelegate
+  virtual ui::AXNodeData* GetData() OVERRIDE;
+  virtual int GetChildCount() OVERRIDE;
+  virtual gfx::NativeViewAccessible ChildAtIndex(int index) OVERRIDE;
+  virtual gfx::NativeViewAccessible GetParent() OVERRIDE;
+  virtual gfx::Vector2d GetGlobalCoordinateOffset() OVERRIDE;
+  virtual void NotifyAccessibilityEvent(ui::AXEvent event_type) OVERRIDE;
+
  protected:
-  NativeViewAccessibility();
+  NativeViewAccessibility(View* view);

[dmazzoni, 2014/07/29 06:35:15]

This will break Windows - the constructor has to take no arguments.

[Andre, 2014/07/29 21:58:56]

Done.

   virtual ~NativeViewAccessibility();
 
  private:
+  View* view_;  // Weak. Owns this.
+  scoped_ptr<ui::AXPlatformNode> ax_node_;
+  ui::AXNodeData data_;
+
   DISALLOW_COPY_AND_ASSIGN(NativeViewAccessibility);
 };