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..3f36f57a664c3f906e4d3754e4b76ac684a71344 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,30 @@ 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(); |
virtual ~NativeViewAccessibility(); |
+ void set_view(views::View* view) { view_ = view; } |
+ const View* view() const { return view_; } |
+ |
+ View* view_; // Weak. Owns this. |
+ |
private: |
+ // 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); |
}; |