Keep track of accessibility focus across windows.

chrome/renderer/extensions/automation_internal_custom_bindings.h

Index: chrome/renderer/extensions/automation_internal_custom_bindings.h
diff --git a/chrome/renderer/extensions/automation_internal_custom_bindings.h b/chrome/renderer/extensions/automation_internal_custom_bindings.h
index cad79593c022094441d2a89590630f1478df1ac0..6764354b25c80ddd5f72212767ef4b88c2423ad2 100644
--- a/chrome/renderer/extensions/automation_internal_custom_bindings.h
+++ b/chrome/renderer/extensions/automation_internal_custom_bindings.h
@@ -85,6 +85,14 @@ class AutomationInternalCustomBindings : public ObjectBackedNativeHandler,
   void RemoveTreeChangeObserver(
       const v8::FunctionCallbackInfo<v8::Value>& args);
 
+  void GetFocus(const v8::FunctionCallbackInfo<v8::Value>& args);
+
+  // Given an initial TreeCache, return the TreeCache and node of the focused
+  // node within this tree or a focused descendant tree.
+  bool GetFocusInternal(TreeCache* top_cache,
+                        TreeCache** out_cache,
+                        ui::AXNode** out_node);
+
   void RouteTreeIDFunction(const std::string& name,
                            void (*callback)(v8::Isolate* isolate,
                                             v8::ReturnValue<v8::Value> result,
@@ -115,53 +123,13 @@ class AutomationInternalCustomBindings : public ObjectBackedNativeHandler,
   // Access the cached accessibility trees and properties of their nodes.
   //
 
-  // Args: int ax_tree_id, int node_id, Returns: int parent_node_id.
-  void GetParentID(const v8::FunctionCallbackInfo<v8::Value>& args);
-
-  // Args: int ax_tree_id, int node_id, Returns: int child_count.
-  void GetChildCount(const v8::FunctionCallbackInfo<v8::Value>& args);
-
   // Args: int ax_tree_id, int node_id, Returns: int child_id.
   void GetChildIDAtIndex(const v8::FunctionCallbackInfo<v8::Value>& args);
 
-  // Args: int ax_tree_id, int node_id, Returns: int index_in_parent.
-  void GetIndexInParent(const v8::FunctionCallbackInfo<v8::Value>& args);
-
   // Args: int ax_tree_id, int node_id
   // Returns: JS object with a string key for each state flag that's set.
   void GetState(const v8::FunctionCallbackInfo<v8::Value>& args);
 
-  // Args: int ax_tree_id, int node_id, Returns: string role_name
-  void GetRole(const v8::FunctionCallbackInfo<v8::Value>& args);
-
-  // Args: int ax_tree_id, int node_id
-  // Returns: JS object with {left, top, width, height}
-  void GetLocation(const v8::FunctionCallbackInfo<v8::Value>& args);
-
-  // Args: int ax_tree_id, int node_id, string attribute_name
-  // Returns: string attribute_value.
-  void GetStringAttribute(const v8::FunctionCallbackInfo<v8::Value>& args);
-
-  // Args: int ax_tree_id, int node_id, string attribute_name
-  // Returns: bool attribute_value.
-  void GetBoolAttribute(const v8::FunctionCallbackInfo<v8::Value>& args);
-
-  // Args: int ax_tree_id, int node_id, string attribute_name
-  // Returns: int attribute_value.
-  void GetIntAttribute(const v8::FunctionCallbackInfo<v8::Value>& args);
-
-  // Args: int ax_tree_id, int node_id, string attribute_name
-  // Returns: float attribute_value.
-  void GetFloatAttribute(const v8::FunctionCallbackInfo<v8::Value>& args);
-
-  // Args: int ax_tree_id, int node_id, string attribute_name
-  // Returns: JS array of int attribute_values.
-  void GetIntListAttribute(const v8::FunctionCallbackInfo<v8::Value>& args);
-
-  // Args: int ax_tree_id, int node_id, string attribute_name
-  // Returns: string attribute_value.
-  void GetHtmlAttribute(const v8::FunctionCallbackInfo<v8::Value>& args);
-
   //
   // Helper functions.
   //