Revert of Revert of Migrate accessibility from RenderView to RenderFrame.

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 633 matching lines @@
 #endif
   return static_cast<gfx::NativeViewId>(NULL);
 }
 
 gfx::NativeViewAccessible RenderWidgetHostViewAura::GetNativeViewAccessible() {
 #if defined(OS_WIN)
   aura::WindowTreeHost* host = window_->GetHost();
   if (!host)
     return static_cast<gfx::NativeViewAccessible>(NULL);
   HWND hwnd = host->GetAcceleratedWidget();
-
-  CreateBrowserAccessibilityManagerIfNeeded();
-  BrowserAccessibilityManager* manager = GetBrowserAccessibilityManager();
+  BrowserAccessibilityManager* manager =
+      host_->GetOrCreateRootBrowserAccessibilityManager();
   if (manager)
     return manager->GetRoot()->ToBrowserAccessibilityWin();
 #endif
 
   NOTIMPLEMENTED();
   return static_cast<gfx::NativeViewAccessible>(NULL);
 }
 
 ui::TextInputClient* RenderWidgetHostViewAura::GetTextInputClient() {
   return this;
@@ skipping 369 matching lines @@
     RecordAction(
         base::UserMetricsAction("BadMessageTerminate_SharedMemoryAura"));
     host_->GetProcess()->ReceivedBadMessage();
     return;
   }
 }
 
 #if defined(OS_WIN)
 void RenderWidgetHostViewAura::SetParentNativeViewAccessible(
     gfx::NativeViewAccessible accessible_parent) {
-  if (GetBrowserAccessibilityManager()) {
-    GetBrowserAccessibilityManager()->ToBrowserAccessibilityManagerWin()
+  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());
   }
@@ skipping 126 matching lines @@
   }
 
   if (overscroll_controller_)
     consumed |= overscroll_controller_->WillHandleEvent(input_event);
 
   return consumed && !WebTouchEvent::isTouchEventType(input_event.type)
              ? INPUT_EVENT_ACK_STATE_CONSUMED
              : INPUT_EVENT_ACK_STATE_NOT_CONSUMED;
 }
 
-void RenderWidgetHostViewAura::CreateBrowserAccessibilityManagerIfNeeded() {
+BrowserAccessibilityManager*
+RenderWidgetHostViewAura::CreateBrowserAccessibilityManager(
+    BrowserAccessibilityDelegate* delegate) {
+  BrowserAccessibilityManager* manager = NULL;
 #if defined(OS_WIN)
-  if (!GetBrowserAccessibilityManager()) {
-    gfx::NativeViewAccessible accessible_parent =
-        host_->GetParentNativeViewAccessible();
-    SetBrowserAccessibilityManager(new BrowserAccessibilityManagerWin(
-        legacy_render_widget_host_HWND_, accessible_parent,
-        BrowserAccessibilityManagerWin::GetEmptyDocument(), host_));
-  }
+  gfx::NativeViewAccessible accessible_parent =
+      host_->GetParentNativeViewAccessible();
+  manager = new BrowserAccessibilityManagerWin(
+      legacy_render_widget_host_HWND_, accessible_parent,
+      BrowserAccessibilityManagerWin::GetEmptyDocument(), delegate);
 #else
-  if (!GetBrowserAccessibilityManager()) {
-    SetBrowserAccessibilityManager(
-        BrowserAccessibilityManager::Create(
-            BrowserAccessibilityManager::GetEmptyDocument(), host_));
-  }
+  manager = BrowserAccessibilityManager::Create(
+      BrowserAccessibilityManager::GetEmptyDocument(), delegate);
 #endif
+  return manager;
 }
 
 gfx::GLSurfaceHandle RenderWidgetHostViewAura::GetCompositingSurface() {
   return ImageTransportFactory::GetInstance()->GetSharedSurfaceHandle();
 }
 
 bool RenderWidgetHostViewAura::LockMouse() {
   aura::Window* root_window = window_->GetRootWindow();
   if (!root_window)
     return false;
@@ skipping 821 matching lines @@
       host_->SetInputMethodActive(input_method->IsActive());
 
       // Often the application can set focus to the view in response to a key
       // down. However the following char event shouldn't be sent to the web
       // page.
       host_->SuppressNextCharEvents();
     } else {
       host_->SetInputMethodActive(false);
     }
 
-    BrowserAccessibilityManager* manager = GetBrowserAccessibilityManager();
+    BrowserAccessibilityManager* manager =
+        host_->GetRootBrowserAccessibilityManager();
     if (manager)
       manager->OnWindowFocused();
   } else if (window_ == lost_focus) {
     host_->SetActive(false);
     host_->Blur();
 
     DetachFromInputMethod();
     host_->SetInputMethodActive(false);
 
     if (touch_editing_client_)
       touch_editing_client_->EndTouchEditing(false);
 
     if (overscroll_controller_)
       overscroll_controller_->Cancel();
 
-    BrowserAccessibilityManager* manager = GetBrowserAccessibilityManager();
+    BrowserAccessibilityManager* manager =
+        host_->GetRootBrowserAccessibilityManager();
     if (manager)
       manager->OnWindowBlurred();
 
     // If we lose the focus while fullscreen, close the window; Pepper Flash
     // won't do it for us (unlike NPAPI Flash). However, we do not close the
     // window if we lose the focus to a window on another display.
     gfx::Screen* screen = gfx::Screen::GetScreenFor(window_);
     bool focusing_other_display =
         gained_focus && screen->GetNumDisplays() > 1 &&
         (screen->GetDisplayNearestWindow(window_).id() !=
@@ skipping 225 matching lines @@
           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*>(
-              GetBrowserAccessibilityManager());
+              host_->GetRootBrowserAccessibilityManager());
       if (manager)
         manager->SetAccessibleHWND(legacy_render_widget_host_HWND_);
     }
   }
 
   if (mouse_locked_)
     UpdateMouseLockRegion();
 #endif
 }
 
@@ skipping 160 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // RenderWidgetHostViewBase, public:
 
 // static
 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) {
   GetScreenInfoForWindow(results, NULL);
 }
 
 }  // namespace content