diff options
Diffstat (limited to 'views')
-rw-r--r-- | views/controls/tree/tree_view.cc | 7 | ||||
-rw-r--r-- | views/controls/tree/tree_view.h | 3 |
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); |