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_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_views.h"
 #endif
 
 namespace extensions {
 class AutomationWebContentsObserver;
@@ skipping 41 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);
-  rwh->EnableTreeOnlyAccessibilityMode();
+  contents->EnableTreeOnlyAccessibilityMode();
   scoped_ptr<base::ListValue> results =
       api::automation_internal::EnableCurrentTab::Results::Create(
           rwh->GetProcess()->GetID(), rwh->GetRoutingID());
   return RespondNow(MultipleArguments(results.release()));
 }
 
 ExtensionFunction::ResponseAction
 AutomationInternalPerformActionFunction::Run() {
   using api::automation_internal::PerformAction::Params;
   scoped_ptr<Params> params(Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
-  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 (!rfh)
+    return RespondNow(NoArguments());
 
   switch (params->args.action_type) {
     case api::automation_internal::ACTION_TYPE_DO_DEFAULT:
-      rwh->AccessibilityDoDefaultAction(params->args.automation_node_id);
+      rfh->AccessibilityDoDefaultAction(params->args.automation_node_id);

[jam, 2014/05/28 18:49:21]

can you explain to me how this id is generated? I tried looking and I got as far
as
https://code.google.com/p/chromium/codesearch#chromium/src/chrome/renderer/re...
but I didn't know what "this.wrapper.id" is.

[dmazzoni, 2014/05/28 18:59:33]

Every accessibility node in Blink has an accessibility-specific node id. An
automation api client receives the accessibility tree and subsequent updates,
just like BrowserAccessibilityManager does. When the automation api client wants
to perform an action on a node (like moving focus), it sends the message back up
to Blink using that id. If the id doesn't exist anymore it's safely ignored.

It's exactly analogous to how BrowserAccessibilityManager calls
AccessibilitySetFocus now; the only difference is that this has to be a public
interface because it's coming from chrome instead of from within content.

[jam, 2014/05/28 21:10:31]

I see, thanks for the explanation I understand this better now. So because the
IPC is sent from chrome\renderer and it has a per-frame accessibility id,
content will need a unique way of getting to the frame, which is the
render_frame_id/render_process_id (i.e. method on RFH). ok, this part is fine
then; just the other nits and it's good to go.

       break;
     case api::automation_internal::ACTION_TYPE_FOCUS:
-      rwh->AccessibilitySetFocus(params->args.automation_node_id);
+      rfh->AccessibilitySetFocus(params->args.automation_node_id);
       break;
     case api::automation_internal::ACTION_TYPE_MAKE_VISIBLE:
-      rwh->AccessibilityScrollToMakeVisible(params->args.automation_node_id,
+      rfh->AccessibilityScrollToMakeVisible(params->args.automation_node_id,
                                             gfx::Rect());
       break;
     case api::automation_internal::ACTION_TYPE_SET_SELECTION: {
       extensions::api::automation_internal::SetSelectionParams selection_params;
       EXTENSION_FUNCTION_VALIDATE(
           extensions::api::automation_internal::SetSelectionParams::Populate(
               params->opt_args.additional_properties, &selection_params));
-      rwh->AccessibilitySetTextSelection(params->args.automation_node_id,
+      rfh->AccessibilitySetTextSelection(params->args.automation_node_id,
                                          selection_params.start_index,
                                          selection_params.end_index);
       break;
     }
     default:
       NOTREACHED();
   }
   return RespondNow(NoArguments());
 }
 
 ExtensionFunction::ResponseAction
 AutomationInternalEnableDesktopFunction::Run() {
 #if defined(OS_CHROMEOS)
   const AutomationInfo* automation_info = AutomationInfo::Get(GetExtension());
   if (!automation_info || !automation_info->desktop)
     return RespondNow(Error("desktop permission must be requested"));
 
   AutomationManagerViews::GetInstance()->Enable(browser_context());
   return RespondNow(NoArguments());
 #else
   return RespondNow(Error("getDesktop is unsupported by this platform"));
 #endif
 }
 
 }  // namespace extensions