Migrate accessibility from RenderView to RenderFrame.

chrome/browser/extensions/api/automation_internal/automation_internal_api.cc

 // Copyright 2014 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/extensions/api/automation_internal/automation_internal_api.h"
 
 #include <vector>
 
 #include "chrome/browser/extensions/api/automation_internal/automation_action_adapter.h"
 #include "chrome/browser/extensions/api/automation_internal/automation_util.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/extensions/api/automation_internal.h"
 #include "chrome/common/extensions/manifest_handlers/automation.h"
 #include "content/public/browser/ax_event_notification_details.h"
+#include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
-#include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/ui/ash/accessibility/automation_manager_ash.h"
 #endif
 
 namespace extensions {
 class AutomationWebContentsObserver;
@@ skipping 77 matching lines @@
   TabStripModel* tab_strip = current_browser->tab_strip_model();
   content::WebContents* contents =
       tab_strip->GetWebContentsAt(tab_strip->active_index());
   if (!contents)
     return RespondNow(Error("No active tab"));
   content::RenderWidgetHost* rwh =
       contents->GetRenderWidgetHostView()->GetRenderWidgetHost();
   if (!rwh)
     return RespondNow(Error("Could not enable accessibility for active tab"));
   AutomationWebContentsObserver::CreateForWebContents(contents);
+  contents->EnableTreeOnlyAccessibilityMode();
   rwh->EnableTreeOnlyAccessibilityMode();
   return RespondNow(
       ArgumentList(api::automation_internal::EnableCurrentTab::Results::Create(
           rwh->GetProcess()->GetID(), rwh->GetRoutingID())));
 }
 
 ExtensionFunction::ResponseAction
 AutomationInternalPerformActionFunction::Run() {
   const AutomationInfo* automation_info = AutomationInfo::Get(GetExtension());
   EXTENSION_FUNCTION_VALIDATE(automation_info && automation_info->interact);
 
   using api::automation_internal::PerformAction::Params;
   scoped_ptr<Params> params(Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
   if (params->args.process_id == kDesktopProcessID &&
       params->args.routing_id == kDesktopRoutingID) {
 #if defined(OS_CHROMEOS)
     return RouteActionToAdapter(
         params.get(), AutomationManagerAsh::GetInstance());
 #else
     NOTREACHED();
     return RespondNow(Error("Unexpected action on desktop automation tree;"
                             " platform does not support desktop automation"));
 #endif  // defined(OS_CHROMEOS)
   }
-  content::RenderWidgetHost* rwh = content::RenderWidgetHost::FromID(
-      params->args.process_id, params->args.routing_id);
+  content::RenderFrameHost* rfh =
+      content::RenderFrameHost::FromID(params->args.process_id,
+                                       params->args.routing_id);
 
-  if (!rwh)
+  if (!rfh)
     return RespondNow(Error("Ignoring action on destroyed node"));
 
-  RenderWidgetHostActionAdapter adapter(rwh);
+  RenderWidgetHostActionAdapter adapter(rfh);
   return RouteActionToAdapter(params.get(), &adapter);
 }
 
 ExtensionFunction::ResponseAction
 AutomationInternalPerformActionFunction::RouteActionToAdapter(
     api::automation_internal::PerformAction::Params* params,
     AutomationActionAdapter* adapter) {
   int32 automation_id = params->args.automation_node_id;
   switch (params->args.action_type) {
     case api::automation_internal::ACTION_TYPE_DODEFAULT:
@@ skipping 29 matching lines @@
     return RespondNow(Error("desktop permission must be requested"));
 
   AutomationManagerAsh::GetInstance()->Enable(browser_context());
   return RespondNow(NoArguments());
 #else
   return RespondNow(Error("getDesktop is unsupported by this platform"));
 #endif  // defined(OS_CHROMEOS)
 }
 
 }  // namespace extensions