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

views/accessibility/native_view_accessibility_win.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_ACCESSIBILITY_NATIVE_VIEW_ACCESSIBILITY_WIN_H_
 #define VIEWS_ACCESSIBILITY_NATIVE_VIEW_ACCESSIBILITY_WIN_H_
 #pragma once
 
 #include <atlbase.h>
 #include <atlcom.h>
 
 #include <oleacc.h>
 
 #include "base/memory/scoped_ptr.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "views/controls/native/native_view_host.h"
 #include "views/view.h"
 
-namespace views {
-extern const char kViewsNativeHostPropForAccessibility[];
 // Note: do not put NativeViewAccessibilityWin in the namespace "views";
 // Visual Studio 2005 does not allow an ATL::CComObject symbol in a namespace.
-}
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // NativeViewAccessibilityWin
 //
 // Class implementing the MSAA IAccessible COM interface for a generic View,
 // providing accessibility to be used by screen readers and other assistive
 // technology (AT).
 //
 ////////////////////////////////////////////////////////////////////////////////
 class ATL_NO_VTABLE NativeViewAccessibilityWin
   : public CComObjectRootEx<CComMultiThreadModel>,
     public IDispatchImpl<IAccessible, &IID_IAccessible, &LIBID_Accessibility> {
  public:
   BEGIN_COM_MAP(NativeViewAccessibilityWin)
     COM_INTERFACE_ENTRY2(IDispatch, IAccessible)
     COM_INTERFACE_ENTRY(IAccessible)
   END_COM_MAP()
 
   // Create method for view accessibility.
   static scoped_refptr<NativeViewAccessibilityWin> Create(views::View* view);
 
-  // Returns the IAccessible interface for a view.
-  static IAccessible* GetAccessibleForView(views::View* view);
-
   virtual ~NativeViewAccessibilityWin();
 
   void set_view(views::View* view) { view_ = view; }
 
   // Supported IAccessible methods.
 
   // Retrieves the child element or child object at a given point on the screen.
   STDMETHODIMP accHitTest(LONG x_left, LONG y_top, VARIANT* child);
 
   // Performs the object's default action.
@@ skipping 84 matching lines @@
                   int start_id,
                   int lower_bound,
                   int upper_bound) const;
 
   // Determines if the child id variant is valid.
   bool IsValidId(const VARIANT& child) const;
 
   // Helper function which sets applicable states of view.
   void SetState(VARIANT* msaa_state, views::View* view);
 
-  // Returns the IAccessible interface for a native view if applicable.
-  // Returns S_OK on success.
-  static HRESULT GetNativeIAccessibleInterface(
-      views::NativeViewHost* native_host, IAccessible** accessible);
-
-  static HRESULT GetNativeIAccessibleInterface(
-      HWND native_view_window, IAccessible** accessible);
-
   // Give CComObject access to the class constructor.
   template <class Base> friend class CComObject;
 
   // Member View needed for view-specific calls.
   views::View* view_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeViewAccessibilityWin);
 };
 
 #endif  // VIEWS_ACCESSIBILITY_NATIVE_VIEW_ACCESSIBILITY_WIN_H_