Make web content accessibility tree a descendant of main window's tree again

views/view.h

Index: views/view.h
===================================================================
--- views/view.h	(revision 88518)
+++ views/view.h	(working copy)
@@ -173,10 +173,6 @@
   // Returns whether the view is hot-tracked.
   virtual bool IsHotTracked() const;
 
-  // FATE TBD ------------------------------------------------------------------
-  // TODO(beng): Figure out what these methods are for and delete them.
-  virtual Widget* GetChildWidget();
-
   // Creation and lifetime -----------------------------------------------------
 
   View();
@@ -872,11 +868,8 @@
   // Modifies |state| to reflect the current accessible state of this view.
   virtual void GetAccessibleState(ui::AccessibleViewState* state) { }
 
-#if defined(OS_WIN)
-  // Returns an instance of the Windows-specific accessibility interface
-  // for this View.
-  NativeViewAccessibilityWin* GetNativeViewAccessibilityWin();
-#endif
+  // Returns an instance of the native accessibility interface for this View.
+  virtual gfx::NativeAccessibleView GetNativeAccessibleView();
 
   // Scrolling -----------------------------------------------------------------
   // TODO(beng): Figure out if this can live somewhere other than View, i.e.
@@ -1447,8 +1440,8 @@
 
   // Accessibility -------------------------------------------------------------
 
-#if defined(OS_WIN)
   // The Windows-specific accessibility implementation for this View.
+#ifdef OS_WIN

[tfarina, 2011/06/10 20:09:01]

the old code is corrected and the preferred way.

[dmazzoni, 2011/06/10 22:38:40]

Done.

   scoped_refptr<NativeViewAccessibilityWin> native_view_accessibility_win_;
 #endif