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

views/widget/native_widget_win.cc

 // 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.
 
 #include "views/widget/native_widget_win.h"
 
 #include <dwmapi.h>
 
 #include "base/string_util.h"
 #include "base/system_monitor/system_monitor.h"
@@ skipping 1142 matching lines @@
 
 LRESULT NativeWidgetWin::OnGetObject(UINT uMsg,
                                      WPARAM w_param,
                                      LPARAM l_param) {
   LRESULT reference_result = static_cast<LRESULT>(0L);
 
   // Accessibility readers will send an OBJID_CLIENT message
   if (OBJID_CLIENT == l_param) {
     // Retrieve MSAA dispatch object for the root view.
     base::win::ScopedComPtr<IAccessible> root(
-        NativeViewAccessibilityWin::GetAccessibleForView(
-            GetWidget()->GetRootView()));
+        GetWidget()->GetRootView()->GetNativeAccessibleView());
 
     // Create a reference that MSAA will marshall to the client.
     reference_result = LresultFromObject(IID_IAccessible, w_param,
         static_cast<IAccessible*>(root.Detach()));
   }
 
   if (kCustomObjectID == l_param) {
     // An MSAA client requestes our custom id. Assume that we have detected an
     // active windows screen reader.
     OnScreenReaderDetected();
@@ skipping 889 matching lines @@
 
   // And now, notify them that they have a brand new parent.
   for (NativeWidgets::iterator it = widgets.begin();
        it != widgets.end(); ++it) {
     (*it)->GetWidget()->NotifyNativeViewHierarchyChanged(true,
                                                          new_parent);
   }
 }
 
 }  // namespace views