Simplify access to LegacyRenderWidgetHostHWND.

content/browser/renderer_host/render_widget_host_view_aura.cc

Index: content/browser/renderer_host/render_widget_host_view_aura.cc
diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
index ad9fffb58881488ee7895c078cb31e83bcbbfc2d..2925d7cac4ad526700d295bae225e2d2dca97e36 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -1042,12 +1042,6 @@ void RenderWidgetHostViewAura::OnSwapCompositorFrame(
 #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()
@@ -1197,10 +1191,7 @@ 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(
@@ -1209,6 +1200,25 @@ RenderWidgetHostViewAura::CreateBrowserAccessibilityManager(
   return manager;
 }
 
+gfx::AcceleratedWidget
+    RenderWidgetHostViewAura::AccessibilityGetAcceleratedWidget() {

[jam, 2014/07/24 01:15:47]

nit: here and below, the style guide says no indentation 

[dmazzoni, 2014/07/26 21:13:48]

Done.

+#if defined(OS_WIN)
+  if (legacy_render_widget_host_HWND_)

[jam, 2014/07/24 01:15:47]

i realize this existed before, but this shouldn't use upper case for any of the
variable's name

[dmazzoni, 2014/07/26 21:13:48]

I'll clean this up shortly, thanks.

+    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();
 }
@@ -2309,12 +2319,6 @@ void RenderWidgetHostViewAura::InternalSetBounds(const gfx::Rect& rect) {
       // 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_);
     }
   }