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

views/view.h

 // Copyright (c) 2011 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 VIEWS_VIEW_H_
 #define VIEWS_VIEW_H_
 #pragma once
 
 #include <algorithm>
 #include <map>
@@ skipping 155 matching lines @@
 
   // TODO(beng): delete
   // Set whether this view is hottracked. A disabled view cannot be hottracked.
   // If flag differs from the current value, SchedulePaint is invoked.
   virtual void SetHotTracked(bool flag);
 
   // TODO(beng): delete
   // 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();
   virtual ~View();
 
   // By default a View is owned by its parent unless specified otherwise here.
   bool parent_owned() const { return parent_owned_; }
   void set_parent_owned(bool parent_owned) { parent_owned_ = parent_owned; }
 
   // Tree operations -----------------------------------------------------------
@@ skipping 675 matching lines @@
 
   // Returns true if the mouse was dragged enough to start a drag operation.
   // delta_x and y are the distance the mouse was dragged.
   static bool ExceededDragThreshold(int delta_x, int delta_y);
 
   // Accessibility -------------------------------------------------------------
 
   // 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.
   //             closer to ScrollView.
 
   // Scrolls the specified region, in this View's coordinate system, to be
   // visible. View's implementation passes the call onto the parent View (after
   // adjusting the coordinates). It is up to views that only show a portion of
   // the child view, such as Viewport, to override appropriately.
   virtual void ScrollRectToVisible(const gfx::Rect& rect);
@@ skipping 550 matching lines @@
 
   // The menu controller.
   ContextMenuController* context_menu_controller_;
 
   // Drag and drop -------------------------------------------------------------
 
   DragController* drag_controller_;
 
   // 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
 
   DISALLOW_COPY_AND_ASSIGN(View);
 };
 
 }  // namespace views
 
 #endif  // VIEWS_VIEW_H_