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

chrome/browser/ui/views/tab_contents/native_tab_contents_container_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 "chrome/browser/ui/views/tab_contents/native_tab_contents_container_win.h"
 
+#include "chrome/browser/renderer_host/render_widget_host_view_win.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/browser/ui/views/tab_contents/tab_contents_container.h"
 #include "chrome/browser/ui/views/tab_contents/tab_contents_view_views.h"
 #include "content/browser/renderer_host/render_widget_host_view.h"
 #include "content/browser/tab_contents/interstitial_page.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "views/focus/focus_manager.h"
 
 ////////////////////////////////////////////////////////////////////////////////
@@ skipping 111 matching lines @@
 void NativeTabContentsContainerWin::AboutToRequestFocusFromTabTraversal(
     bool reverse) {
   container_->tab_contents()->FocusThroughTabTraversal(reverse);
 }
 
 void NativeTabContentsContainerWin::GetAccessibleState(
     ui::AccessibleViewState* state) {
   state->role = ui::AccessibilityTypes::ROLE_GROUPING;
 }
 
+gfx::NativeAccessibleView
+    NativeTabContentsContainerWin::GetNativeAccessibleView() {

[Chris Guillory, 2011/06/10 19:10:09]

Nit: I don't think you need to indent the function.

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

Done.

+  TabContents* tab_contents = container_->tab_contents();
+  if (tab_contents) {
+    RenderWidgetHostViewWin* host_view_win =
+        static_cast<RenderWidgetHostViewWin*>(
+            tab_contents->GetRenderWidgetHostView());
+    if (host_view_win)
+      return host_view_win->GetIAccessible();
+  }
+
+  return View::GetNativeAccessibleView();
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // NativeTabContentsContainer, public:
 
 // static
 NativeTabContentsContainer* NativeTabContentsContainer::CreateNativeContainer(
     TabContentsContainer* container) {
   return new NativeTabContentsContainerWin(container);
 }