Move some AX attrs from AXNodeData to AXTreeData.

content/browser/accessibility/browser_accessibility_manager.h

 // Copyright (c) 2012 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.
 
 #ifndef CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_MANAGER_H_
 #define CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_MANAGER_H_
 
 #include <vector>
 
 #include "base/containers/hash_tables.h"
@@ skipping 14 matching lines @@
 class BrowserAccessibility;
 class BrowserAccessibilityManager;
 #if defined(OS_ANDROID)
 class BrowserAccessibilityManagerAndroid;
 #elif defined(OS_WIN)
 class BrowserAccessibilityManagerWin;
 #elif defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_X11)
 class BrowserAccessibilityManagerAuraLinux;
 #endif
 
-using SimpleAXTreeUpdate = ui::AXTreeUpdate<ui::AXNodeData>;
-
 // For testing.
-CONTENT_EXPORT SimpleAXTreeUpdate MakeAXTreeUpdate(
+CONTENT_EXPORT ui::AXTreeUpdate MakeAXTreeUpdate(
     const ui::AXNodeData& node,
     const ui::AXNodeData& node2 = ui::AXNodeData(),
     const ui::AXNodeData& node3 = ui::AXNodeData(),
     const ui::AXNodeData& node4 = ui::AXNodeData(),
     const ui::AXNodeData& node5 = ui::AXNodeData(),
     const ui::AXNodeData& node6 = ui::AXNodeData(),
     const ui::AXNodeData& node7 = ui::AXNodeData(),
     const ui::AXNodeData& node8 = ui::AXNodeData(),
     const ui::AXNodeData& node9 = ui::AXNodeData());
 
@@ skipping 62 matching lines @@
   // to move screen reader focus to that event.
   int active_request_id;
 };
 
 // Manages a tree of BrowserAccessibility objects.
 class CONTENT_EXPORT BrowserAccessibilityManager : public ui::AXTreeDelegate {
  public:
   // Creates the platform-specific BrowserAccessibilityManager, but
   // with no parent window pointer. Only useful for unit tests.
   static BrowserAccessibilityManager* Create(
-      const SimpleAXTreeUpdate& initial_tree,
+      const ui::AXTreeUpdate& initial_tree,
       BrowserAccessibilityDelegate* delegate,
       BrowserAccessibilityFactory* factory = new BrowserAccessibilityFactory());
 
   static BrowserAccessibilityManager* FromID(
       AXTreeIDRegistry::AXTreeID ax_tree_id);
 
   ~BrowserAccessibilityManager() override;
 
-  void Initialize(const SimpleAXTreeUpdate& initial_tree);
+  void Initialize(const ui::AXTreeUpdate& initial_tree);
 
-  static SimpleAXTreeUpdate GetEmptyDocument();
+  static ui::AXTreeUpdate GetEmptyDocument();
 
   virtual void NotifyAccessibilityEvent(
       ui::AXEvent event_type, BrowserAccessibility* node) { }
 
   // Return a pointer to the root of the tree, does not make a new reference.
   BrowserAccessibility* GetRoot();
 
   // Returns a pointer to the BrowserAccessibility object for a given AXNode.
   BrowserAccessibility* GetFromAXNode(const ui::AXNode* node) const;
 
   // Return a pointer to the object corresponding to the given id,
   // does not make a new reference.
   BrowserAccessibility* GetFromID(int32 id) const;
 
   // If this tree has a parent tree, return the parent node in that tree.
   BrowserAccessibility* GetParentNodeFromParentTree();
 
+  // Get the AXTreeData for this frame.
+  const ui::AXTreeData& GetTreeData();
+
   // Called to notify the accessibility manager that its associated native
   // view got focused.
   virtual void OnWindowFocused();
 
   // Called to notify the accessibility manager that its associated native
   // view lost focus.
   virtual void OnWindowBlurred();
 
   // Notify the accessibility manager about page navigation.
   void UserIsNavigatingAway();
@@ skipping 94 matching lines @@
   virtual bool UseRootScrollOffsetsWhenComputingBounds();
 
   // Walk the tree.
   BrowserAccessibility* NextInTreeOrder(BrowserAccessibility* node) const;
   BrowserAccessibility* PreviousInTreeOrder(BrowserAccessibility* node) const;
   BrowserAccessibility* NextTextOnlyObject(BrowserAccessibility* node) const;
   BrowserAccessibility* PreviousTextOnlyObject(
       BrowserAccessibility* node) const;
 
   // AXTreeDelegate implementation.
+  void OnTreeDataChanged(ui::AXTree* tree) override;
   void OnNodeWillBeDeleted(ui::AXTree* tree, ui::AXNode* node) override;
   void OnSubtreeWillBeDeleted(ui::AXTree* tree, ui::AXNode* node) override;
   void OnNodeCreated(ui::AXTree* tree, ui::AXNode* node) override;
   void OnNodeChanged(ui::AXTree* tree, ui::AXNode* node) override;
   void OnAtomicUpdateFinished(
       ui::AXTree* tree,
       bool root_changed,
       const std::vector<ui::AXTreeDelegate::Change>& changes) override;
 
   BrowserAccessibilityDelegate* delegate() const { return delegate_; }
   void set_delegate(BrowserAccessibilityDelegate* delegate) {
     delegate_ = delegate;
   }
 
   // If this BrowserAccessibilityManager is a child frame or guest frame,
   // return the BrowserAccessibilityDelegate from the highest ancestor frame
   // in the frame tree.
   BrowserAccessibilityDelegate* GetDelegateFromRootManager();
 
   // Get a snapshot of the current tree as an AXTreeUpdate.
-  SimpleAXTreeUpdate SnapshotAXTreeForTesting();
+  ui::AXTreeUpdate SnapshotAXTreeForTesting();
 
  protected:
   BrowserAccessibilityManager(
       BrowserAccessibilityDelegate* delegate,
       BrowserAccessibilityFactory* factory);
 
   BrowserAccessibilityManager(
-      const SimpleAXTreeUpdate& initial_tree,
+      const ui::AXTreeUpdate& initial_tree,
       BrowserAccessibilityDelegate* delegate,
       BrowserAccessibilityFactory* factory);
 
  private:
   // The following states keep track of whether or not the
   // on-screen keyboard is allowed to be shown.
   enum OnScreenKeyboardState {
     // Never show the on-screen keyboard because this tab is hidden.
     OSK_DISALLOWED_BECAUSE_TAB_HIDDEN,
 
@@ skipping 44 matching lines @@
   // node within that parent tree. It's computed as needed and cached for
   // speed so that it can be accessed quickly if it hasn't changed.
   int parent_node_id_from_parent_tree_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserAccessibilityManager);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_MANAGER_H_