Keep track of accessibility focus across windows.

content/browser/accessibility/browser_accessibility_manager_mac.mm

Index: content/browser/accessibility/browser_accessibility_manager_mac.mm
diff --git a/content/browser/accessibility/browser_accessibility_manager_mac.mm b/content/browser/accessibility/browser_accessibility_manager_mac.mm
index 0edf58462263566159a3d559878d465bf3d0764e..e2ecc400fbf9bc1d021f52511b2787e76f4dcbb8 100644
--- a/content/browser/accessibility/browser_accessibility_manager_mac.mm
+++ b/content/browser/accessibility/browser_accessibility_manager_mac.mm
@@ -106,16 +106,15 @@ ui::AXTreeUpdate
   return update;
 }
 
-BrowserAccessibility* BrowserAccessibilityManagerMac::GetFocus(
-    BrowserAccessibility* root) {
+BrowserAccessibility* BrowserAccessibilityManagerMac::GetFocus() {
   // On Mac, list boxes should always get focus on the whole list, otherwise
   // information about the number of selected items will never be reported.
-  BrowserAccessibility* node = BrowserAccessibilityManager::GetFocus(root);
+  BrowserAccessibility* node = BrowserAccessibilityManager::GetFocus();
   if (node && node->GetRole() == ui::AX_ROLE_LIST_BOX)
     return node;
 
   // For other roles, follow the active descendant.
-  return GetActiveDescendantFocus(root);
+  return GetActiveDescendantFocus(node);
 }
 
 void BrowserAccessibilityManagerMac::NotifyAccessibilityEvent(
@@ -125,8 +124,7 @@ void BrowserAccessibilityManagerMac::NotifyAccessibilityEvent(
     return;
 
   if (event_type == ui::AX_EVENT_FOCUS) {
-    BrowserAccessibility* active_descendant = GetActiveDescendantFocus(
-        GetRoot());
+    BrowserAccessibility* active_descendant = GetActiveDescendantFocus(node);
     if (active_descendant)
       node = active_descendant;
 
@@ -135,7 +133,7 @@ void BrowserAccessibilityManagerMac::NotifyAccessibilityEvent(
         node->GetParent() &&
         node->GetParent()->GetRole() == ui::AX_ROLE_LIST_BOX) {
       node = node->GetParent();
-      SetFocus(node, false);
+      SetFocus(*node);
     }
   }