Allow requesting Automation tree by tabId

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/string_number_conversions.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/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_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/error_utils.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);
@@ skipping 57 matching lines @@
   virtual void SetSelection(int32 id, int32 start, int32 end) OVERRIDE {
     rwh_->AccessibilitySetTextSelection(id, start, end);
   }
 
  private:
   content::RenderWidgetHost* rwh_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostActionAdapter);
 };
 
-// TODO(aboxhall/dtseng): ensure that the initial data is sent down for the tab
-// if this doesn't turn accessibility on for the first time (e.g. if a
-// RendererAccessibility object existed already because a screenreader has been
-// run at some point).
 ExtensionFunction::ResponseAction
-AutomationInternalEnableCurrentTabFunction::Run() {
-  Browser* current_browser = GetCurrentBrowser();
-  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"));
+AutomationInternalEnableTabFunction::Run() {
+  using api::automation_internal::EnableTab::Params;
+  scoped_ptr<Params> params(Params::Create(*args_));
+  EXTENSION_FUNCTION_VALIDATE(params.get());
+  content::WebContents* contents = NULL;
+  if (params->tab_id.get()) {
+    TabStripModel* tab_strip = NULL;
+    int tab_index = -1;
+    int tab_id = *params->tab_id;
+    if (!ExtensionTabUtil::GetTabById(tab_id,
+                                      GetProfile(),
+                                      include_incognito(),
+                                      NULL,

[David Tseng, 2014/05/29 22:41:31]

What is this (in-line comments would help out)?

[aboxhall, 2014/05/30 15:37:11]

Added inline comments.

+                                      &tab_strip,
+                                      &contents,
+                                      &tab_index)) {
+      return RespondNow(Error(
+          ErrorUtils::FormatErrorMessage(tabs_constants::kTabNotFoundError,
+                                         base::IntToString(tab_id))));
+    }
+  } else {
+    contents = GetCurrentBrowser()->tab_strip_model()->GetActiveWebContents();
+    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();
   return RespondNow(
-      ArgumentList(api::automation_internal::EnableCurrentTab::Results::Create(
+      ArgumentList(api::automation_internal::EnableTab::Results::Create(
           rwh->GetProcess()->GetID(), rwh->GetRoutingID())));
-}
+  }

[David Tseng, 2014/05/29 22:41:31]

While we're here and I don't forget to ask, are you planning on handling the
"destroyed" code path to help us cleanup extension-side?

[aboxhall, 2014/05/30 15:37:11]

Yes, sorry - that is next on my list :)

 
 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());
 
@@ skipping 57 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