Enable chrome.automation.getDesktop on all aura platforms.

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 "base/strings/string16.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/accessibility/ax_tree_id_registry.h"
 #include "chrome/browser/extensions/api/automation_internal/automation_action_adapter.h"
 #include "chrome/browser/extensions/api/automation_internal/automation_util.h"
 #include "chrome/browser/extensions/api/tabs/tabs_constants.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/ui/aura/accessibility/automation_manager_aura.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/browser_accessibility_state.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"
 #include "extensions/common/extension_messages.h"
 #include "extensions/common/permissions/permissions_data.h"
 
-#if defined(OS_CHROMEOS)
-#include "chrome/browser/ui/ash/accessibility/automation_manager_ash.h"
-#endif
-
 namespace extensions {
 class AutomationWebContentsObserver;
 }  // namespace extensions
 
 DEFINE_WEB_CONTENTS_USER_DATA_KEY(extensions::AutomationWebContentsObserver);
 
 namespace extensions {
 
 namespace {
 const int kDesktopTreeID = 0;
@@ skipping 203 matching lines @@
   AutomationWebContentsObserver::CreateForWebContents(contents);
   contents->EnableTreeOnlyAccessibilityMode();
   int ax_tree_id = AXTreeIDRegistry::GetInstance()->GetOrCreateAXTreeID(
       rfh->GetProcess()->GetID(), rfh->GetRoutingID());
   return RespondNow(ArgumentList(
       api::automation_internal::EnableTab::Results::Create(ax_tree_id)));
 }
 
 ExtensionFunction::ResponseAction AutomationInternalEnableFrameFunction::Run() {
 // TODO(dtseng): Limited to desktop tree for now pending out of proc iframes.
-#if defined(OS_CHROMEOS)
   using api::automation_internal::EnableFrame::Params;
 
   scoped_ptr<Params> params(Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
   AXTreeIDRegistry::FrameID frame_id =
       AXTreeIDRegistry::GetInstance()->GetFrameID(params->tree_id);
   content::RenderFrameHost* rfh =
       content::RenderFrameHost::FromID(frame_id.first, frame_id.second);
   if (!rfh)
     return RespondNow(Error("unable to load tab"));
 
   content::WebContents* contents =
       content::WebContents::FromRenderFrameHost(rfh);
   AutomationWebContentsObserver::CreateForWebContents(contents);
   contents->EnableTreeOnlyAccessibilityMode();
 
   return RespondNow(NoArguments());
-#endif
-  return RespondNow(Error("enableFrame is only supported on Chrome OS"));
 }
 
 ExtensionFunction::ResponseAction
 AutomationInternalPerformActionFunction::Run() {
   const AutomationInfo* automation_info = AutomationInfo::Get(extension());
   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.tree_id == kDesktopTreeID) {
 #if defined(OS_CHROMEOS)
-    return RouteActionToAdapter(
-        params.get(), AutomationManagerAsh::GetInstance());
+    return RouteActionToAdapter(params.get(),
+                                AutomationManagerAura::GetInstance());
 #else
     NOTREACHED();
     return RespondNow(Error("Unexpected action on desktop automation tree;"
                             " platform does not support desktop automation"));
 #endif  // defined(OS_CHROMEOS)
   }
   AXTreeIDRegistry::FrameID frame_id =
       AXTreeIDRegistry::GetInstance()->GetFrameID(params->args.tree_id);
   content::RenderFrameHost* rfh =
       content::RenderFrameHost::FromID(frame_id.first, frame_id.second);
@@ skipping 37 matching lines @@
       break;
     }
     default:
       NOTREACHED();
   }
   return RespondNow(NoArguments());
 }
 
 ExtensionFunction::ResponseAction
 AutomationInternalEnableDesktopFunction::Run() {
-#if defined(OS_CHROMEOS)
   const AutomationInfo* automation_info = AutomationInfo::Get(extension());
   if (!automation_info || !automation_info->desktop)
     return RespondNow(Error("desktop permission must be requested"));
 
-  AutomationManagerAsh::GetInstance()->Enable(browser_context());
+  AutomationManagerAura::GetInstance()->Enable(browser_context());
   return RespondNow(NoArguments());
-#else
-  return RespondNow(Error("getDesktop is unsupported by this platform"));
-#endif  // defined(OS_CHROMEOS)
 }
 
 // static
 int AutomationInternalQuerySelectorFunction::query_request_id_counter_ = 0;
 
 ExtensionFunction::ResponseAction
 AutomationInternalQuerySelectorFunction::Run() {
   const AutomationInfo* automation_info = AutomationInfo::Get(extension());
   EXTENSION_FUNCTION_VALIDATE(automation_info);
 
@@ skipping 31 matching lines @@
     int result_acc_obj_id) {
   if (!error.empty()) {
     Respond(Error(error));
     return;
   }
 
   Respond(OneArgument(new base::FundamentalValue(result_acc_obj_id)));
 }
 
 }  // namespace extensions