Draw an accessibility focus ring around the focused object in ChromeVox Next.

BUG=314889

Review URL: https://codereview.chromium.org/595413002

Cr-Commit-Position: refs/heads/master@{#296773}

chrome/browser/extensions/api/automation/automation_apitest.cc

@@ -237,8 +237,8 @@ class TreeSerializationState {
                                                routing_id);
     std::vector<content::AXEventNotificationDetails> details;
     details.push_back(detail);
-    automation_util::DispatchAccessibilityEventsToAutomation(details,
-                                                             browser_context);
+    automation_util::DispatchAccessibilityEventsToAutomation(
+        details, browser_context, gfx::Vector2d());
   }
 
   // Notify the extension bindings to destroy the tree for the given tab

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

@@ -76,7 +76,8 @@ class AutomationWebContentsObserver
       const std::vector<content::AXEventNotificationDetails>& details)
       OVERRIDE {
     automation_util::DispatchAccessibilityEventsToAutomation(
-        details, browser_context_);
+        details, browser_context_,
+        web_contents()->GetContainerBounds().OffsetFromOrigin());
   }
 
   virtual void RenderFrameDeleted(

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

@@ -125,7 +125,8 @@ namespace automation_util {
 
 void DispatchAccessibilityEventsToAutomation(
     const std::vector<content::AXEventNotificationDetails>& details,
-    content::BrowserContext* browser_context) {
+    content::BrowserContext* browser_context,
+    const gfx::Vector2d& location_offset) {
   using api::automation_internal::AXEventParams;
   using api::automation_internal::AXTreeUpdate;
 
@@ -143,9 +144,11 @@ void DispatchAccessibilityEventsToAutomation(
     AXTreeUpdate& ax_tree_update = ax_event_params.update;
     ax_tree_update.node_id_to_clear = event.node_id_to_clear;
     for (size_t i = 0; i < event.nodes.size(); ++i) {
+      ui::AXNodeData src = event.nodes[i];
+      src.location.Offset(location_offset);
       linked_ptr<api::automation_internal::AXNodeData> out_node(
           new api::automation_internal::AXNodeData());
-      PopulateNodeData(event.nodes[i], out_node);
+      PopulateNodeData(src, out_node);
       ax_tree_update.nodes.push_back(out_node);
     }
 

chrome/browser/extensions/api/automation_internal/automation_util.h

@@ -27,7 +27,8 @@ namespace automation_util {
 // from accessibility to Automation types.
 void DispatchAccessibilityEventsToAutomation(
     const std::vector<content::AXEventNotificationDetails>& details,
-    content::BrowserContext* browser_context);
+    content::BrowserContext* browser_context,
+    const gfx::Vector2d& location_offset);
 
 void DispatchTreeDestroyedEventToAutomation(
     int process_id,

chrome/browser/resources/chromeos/chromevox/cvox2/background/background.js

@@ -95,6 +95,7 @@ cvox2.Background.prototype = {
     var output = evt.target.attributes.name + ' ' + evt.target.role;
     cvox.ChromeVox.tts.speak(output, cvox.AbstractTts.QUEUE_MODE_FLUSH);
     cvox.ChromeVox.braille.write(cvox.NavBraille.fromText(output));
+    chrome.accessibilityPrivate.setFocusRing([evt.target.location]);
   },
 
   /**

chrome/browser/ui/ash/accessibility/automation_manager_ash.cc

@@ -112,5 +112,5 @@ void AutomationManagerAsh::SendEvent(BrowserContext* context,
   std::vector<content::AXEventNotificationDetails> details;
   details.push_back(detail);
   extensions::automation_util::DispatchAccessibilityEventsToAutomation(
-      details, context);
+      details, context, gfx::Vector2d());
 }

chrome/test/data/extensions/api_test/automation/tests/tabs/location.js

@@ -7,8 +7,12 @@ var allTests = [
     function assertOkButtonLocation(event) {
       var okButton = rootNode.firstChild().firstChild();
       assertTrue('location' in okButton);
-      assertEq({left:100, top: 200, width: 300, height: 400},
-               okButton.location);
+
+      // We can't assert the left and top positions because they're
+      // returned in global screen coordinates. Just check the width and
+      // height.
+      assertEq(300, okButton.location.width);
+      assertEq(400, okButton.location.height);
       chrome.test.succeed();
     };