Move some AX attrs from AXNodeData to AXTreeData.

ui/accessibility/ax_tree.h

 // Copyright 2013 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 UI_ACCESSIBILITY_AX_TREE_H_
 #define UI_ACCESSIBILITY_AX_TREE_H_
 
 #include <set>
 
 #include "base/containers/hash_tables.h"
 #include "ui/accessibility/ax_export.h"
+#include "ui/accessibility/ax_node_data.h"
+#include "ui/accessibility/ax_tree_data.h"
 #include "ui/accessibility/ax_tree_update.h"
 
 namespace ui {
 
 class AXNode;
 class AXTree;
 struct AXTreeUpdateState;
 
 // Used when you want to be notified when changes happen to the tree.
 //
 // Some of the notifications are called in the middle of an update operation.
 // Be careful, as the tree may be in an inconsistent state at this time;
 // don't walk the parents and children at this time:
 //   OnNodeWillBeDeleted
 //   OnSubtreeWillBeDeleted
 //   OnNodeCreated
 //   OnNodeChanged
 //
 // In addition, one additional notification is fired at the end of an
 // atomic update, and it provides a vector of nodes that were added or
 // changed, for final postprocessing:
 //   OnAtomicUpdateFinished
 //
 class AX_EXPORT AXTreeDelegate {
  public:
   AXTreeDelegate();
   virtual ~AXTreeDelegate();
 
+  // Called when tree data changes.
+  virtual void OnTreeDataChanged(AXTree* tree) = 0;
+
   // Called just before a node is deleted. Its id and data will be valid,
   // but its links to parents and children are invalid. This is called
   // in the middle of an update, the tree may be in an invalid state!
   virtual void OnNodeWillBeDeleted(AXTree* tree, AXNode* node) = 0;
 
   // Same as OnNodeWillBeDeleted, but only called once for an entire subtree.
   // This is called in the middle of an update, the tree may be in an
   // invalid state!
   virtual void OnSubtreeWillBeDeleted(AXTree* tree, AXNode* node) = 0;
 
@@ skipping 31 matching lines @@
 };
 
 // AXTree is a live, managed tree of AXNode objects that can receive
 // updates from another AXTreeSource via AXTreeUpdates, and it can be
 // used as a source for sending updates to another client tree.
 // It's designed to be subclassed to implement support for native
 // accessibility APIs on a specific platform.
 class AX_EXPORT AXTree {
  public:
   AXTree();
-  explicit AXTree(const AXTreeUpdate<AXNodeData>& initial_state);
+  explicit AXTree(const AXTreeUpdate& initial_state);
   virtual ~AXTree();
 
   virtual void SetDelegate(AXTreeDelegate* delegate);
 
   AXNode* root() const { return root_; }
 
+  const AXTreeData& data() const { return data_; }
+
   // Returns the AXNode with the given |id| if it is part of this AXTree.
   AXNode* GetFromId(int32 id) const;
 
   // Returns true on success. If it returns false, it's a fatal error
   // and this tree should be destroyed, and the source of the tree update
   // should not be trusted any longer.
-  virtual bool Unserialize(const AXTreeUpdate<AXNodeData>& update);
+  virtual bool Unserialize(const AXTreeUpdate& update);
+
+  virtual void UpdateData(const AXTreeData& data);
 
   // Return a multi-line indented string representation, for logging.
   std::string ToString() const;
 
   // A string describing the error from an unsuccessful Unserialize,
   // for testing and debugging.
   const std::string& error() const { return error_; }
 
   int size() { return static_cast<int>(id_map_.size()); }
 
@@ skipping 27 matching lines @@
   // error. Returns true on success, false on fatal error.
   bool CreateNewChildVector(AXNode* node,
                             const std::vector<int32>& new_child_ids,
                             std::vector<AXNode*>* new_children,
                             AXTreeUpdateState* update_state);
 
   AXTreeDelegate* delegate_;
   AXNode* root_;
   base::hash_map<int32, AXNode*> id_map_;
   std::string error_;
+  AXTreeData data_;
 };
 
 }  // namespace ui
 
 #endif  // UI_ACCESSIBILITY_AX_TREE_H_