1 files changed, 1 insertions, 68 deletions
diff --git a/chrome/views/tree_view.h b/chrome/views/tree_view.h
index c2fe4d3..582de9f 100644
--- a/chrome/views/tree_view.h
+++ b/chrome/views/tree_view.h
@@ -10,79 +10,12 @@
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "chrome/views/native_control.h"
+#include "chrome/views/tree_model.h"
 
 namespace views {
 
-class TreeModel;
-class TreeModelNode;
 class TreeView;
 
-// Observer for the TreeModel. Notified of significant events to the model.
-class TreeModelObserver {
- public:
-  // Notification that nodes were added to the specified parent.
-  virtual void TreeNodesAdded(TreeModel* model,
-                              TreeModelNode* parent,
-                              int start,
-                              int count) = 0;
-
-  // Notification that nodes were removed from the specified parent.
-  virtual void TreeNodesRemoved(TreeModel* model,
-                                TreeModelNode* parent,
-                                int start,
-                                int count) = 0;
-
-  // Notification that the contents of a node has changed.
-  virtual void TreeNodeChanged(TreeModel* model, TreeModelNode* node) = 0;
-};
-
-// TreeModelNode --------------------------------------------------------------
-
-// Type of class returned from the model.
-class TreeModelNode {
- public:
-  // Returns the title for the node.
-  virtual std::wstring GetTitle() = 0;
-};
-
-// TreeModel ------------------------------------------------------------------
-
-// The model for TreeView.
-class TreeModel {
- public:
-  // Returns the root of the tree. This may or may not be shown in the tree,
-  // see SetRootShown for details.
-  virtual TreeModelNode* GetRoot() = 0;
-
-  // Returns the number of children in the specified node.
-  virtual int GetChildCount(TreeModelNode* parent) = 0;
-
-  // Returns the child node at the specified index.
-  virtual TreeModelNode* GetChild(TreeModelNode* parent, int index) = 0;
-
-  // Returns the parent of a node, or NULL if node is the root.
-  virtual TreeModelNode* GetParent(TreeModelNode* node) = 0;
-
-  // Sets the observer of the model.
-  virtual void SetObserver(TreeModelObserver* observer) = 0;
-
-  // Sets the title of the specified node.
-  // This is only invoked if the node is editable and the user edits a node.
-  virtual void SetTitle(TreeModelNode* node,
-                        const std::wstring& title) {
-    NOTREACHED();
-  }
-
-  // Returns the set of icons for the nodes in the tree. You only need override
-  // this if you don't want to use the default folder icons.
-  virtual void GetIcons(std::vector<SkBitmap>* icons) {}
-
-  // Returns the index of the icon to use for |node|. Return -1 to use the
-  // default icon. The index is relative to the list of icons returned from
-  // GetIcons.
-  virtual int GetIconIndex(TreeModelNode* node) { return -1; }
-};
-
 // TreeViewController ---------------------------------------------------------
 
 // Controller for the treeview.