Wires up persisting expanded folders in the bookmark editor for views.

BUG=6648
TEST=add a bookmark, expand some folders, add another bookmark and
make sure the same set of folders remain expanded.
R=ben@chromium.org

Review URL: http://codereview.chromium.org/7387014

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92757 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 2 insertions, 8 deletions

diff --git a/views/controls/tree/tree_view.cc b/views/controls/tree/tree_view.cc
index 91b9512..5a02376 100644
--- a/views/controls/tree/tree_view.cc
+++ b/views/controls/tree/tree_view.cc
@@ -166,11 +166,6 @@ void TreeView::Expand(TreeModelNode* node) {
   TreeView_Expand(tree_view_, GetNodeDetails(node)->tree_item, TVE_EXPAND);
 }
 
-void TreeView::ExpandAll() {
-  DCHECK(model_);
-  ExpandAll(model_->GetRoot());
-}
-
 void TreeView::ExpandAll(TreeModelNode* node) {
   DCHECK(node);
   // Expand the node.
@@ -184,6 +179,8 @@ void TreeView::ExpandAll(TreeModelNode* node) {
 }
 
 bool TreeView::IsExpanded(TreeModelNode* node) {
+  if (!tree_view_)
+    return false;
   TreeModelNode* parent = model_->GetParent(node);
   if (!parent)
     return true;
diff --git a/views/controls/tree/tree_view.h b/views/controls/tree/tree_view.h
index 9c72644..c43502b 100644
--- a/views/controls/tree/tree_view.h
+++ b/views/controls/tree/tree_view.h
@@ -105,9 +105,6 @@ class TreeView : public NativeControl, ui::TreeModelObserver {
   // Make sure node and all its parents are expanded.
   void Expand(ui::TreeModelNode* node);
 
-  // Convenience to expand ALL nodes in the tree.
-  void ExpandAll();
-
   // Invoked from ExpandAll(). Expands the supplied node and recursively
   // invokes itself with all children.
   void ExpandAll(ui::TreeModelNode* node);