Simplify access to LegacyRenderWidgetHostHWND.

content/browser/renderer_host/render_widget_host_view_aura.cc

 // Copyright (c) 2012 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 "content/browser/renderer_host/render_widget_host_view_aura.h"
 
 #include "base/auto_reset.h"
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/callback_helpers.h"
@@ skipping 1024 matching lines @@
     RecordAction(
         base::UserMetricsAction("BadMessageTerminate_SharedMemoryAura"));
     host_->GetProcess()->ReceivedBadMessage();
     return;
   }
 }
 
 #if defined(OS_WIN)
 void RenderWidgetHostViewAura::SetParentNativeViewAccessible(
     gfx::NativeViewAccessible accessible_parent) {
-  BrowserAccessibilityManager* manager =
-      host_->GetRootBrowserAccessibilityManager();
-  if (manager) {
-    manager->ToBrowserAccessibilityManagerWin()
-        ->set_parent_iaccessible(accessible_parent);
-  }
 }
 
 gfx::NativeViewId RenderWidgetHostViewAura::GetParentForWindowlessPlugin()
     const {
   if (legacy_render_widget_host_HWND_) {
     return reinterpret_cast<gfx::NativeViewId>(
         legacy_render_widget_host_HWND_->hwnd());
   }
   return NULL;
 }
@@ skipping 129 matching lines @@
   return consumed && !WebTouchEvent::isTouchEventType(input_event.type)
              ? INPUT_EVENT_ACK_STATE_CONSUMED
              : INPUT_EVENT_ACK_STATE_NOT_CONSUMED;
 }
 
 BrowserAccessibilityManager*
 RenderWidgetHostViewAura::CreateBrowserAccessibilityManager(
     BrowserAccessibilityDelegate* delegate) {
   BrowserAccessibilityManager* manager = NULL;
 #if defined(OS_WIN)
-  gfx::NativeViewAccessible accessible_parent =
-      host_->GetParentNativeViewAccessible();
   manager = new BrowserAccessibilityManagerWin(
-      legacy_render_widget_host_HWND_, accessible_parent,
       BrowserAccessibilityManagerWin::GetEmptyDocument(), delegate);
 #else
   manager = BrowserAccessibilityManager::Create(
       BrowserAccessibilityManager::GetEmptyDocument(), delegate);
 #endif
   return manager;
 }
 
+gfx::AcceleratedWidget
+RenderWidgetHostViewAura::AccessibilityGetAcceleratedWidget() {
+#if defined(OS_WIN)
+  if (legacy_render_widget_host_HWND_)
+    return legacy_render_widget_host_HWND_->hwnd();
+#endif
+  return gfx::kNullAcceleratedWidget;
+}
+
+gfx::NativeViewAccessible
+RenderWidgetHostViewAura::AccessibilityGetNativeViewAccessible() {
+#if defined(OS_WIN)
+  if (legacy_render_widget_host_HWND_)
+    return legacy_render_widget_host_HWND_->window_accessible();
+#endif
+  return NULL;
+
+}
+
 gfx::GLSurfaceHandle RenderWidgetHostViewAura::GetCompositingSurface() {
   return ImageTransportFactory::GetInstance()->GetSharedSurfaceHandle();
 }
 
 bool RenderWidgetHostViewAura::LockMouse() {
   aura::Window* root_window = window_->GetRootWindow();
   if (!root_window)
     return false;
 
   if (mouse_locked_)
@@ skipping 1080 matching lines @@
     if (legacy_render_widget_host_HWND_) {
       legacy_render_widget_host_HWND_->set_host(this);
       legacy_render_widget_host_HWND_->SetBounds(
           window_->GetBoundsInRootWindow());
       // There are cases where the parent window is created, made visible and
       // the associated RenderWidget is also visible before the
       // LegacyRenderWidgetHostHWND instace is created. Ensure that it is shown
       // here.
       if (!host_->is_hidden())
         legacy_render_widget_host_HWND_->Show();
-
-      BrowserAccessibilityManagerWin* manager =
-          static_cast<BrowserAccessibilityManagerWin*>(
-              host_->GetRootBrowserAccessibilityManager());
-      if (manager)
-        manager->SetAccessibleHWND(legacy_render_widget_host_HWND_);
     }
   }
 
   if (mouse_locked_)
     UpdateMouseLockRegion();
 #endif
 }
 
 void RenderWidgetHostViewAura::SchedulePaintIfNotInClip(
     const gfx::Rect& rect,
@@ skipping 158 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // RenderWidgetHostViewBase, public:
 
 // static
 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) {
   GetScreenInfoForWindow(results, NULL);
 }
 
 }  // namespace content