| Index: chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc
|
| diff --git a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc
|
| index ecac9bfa4e75e8fd2ca7b16a0603fbfc238e3e2c..78fa83b9c8c5106b2c1e4269090f5aedee2d521e 100644
|
| --- a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc
|
| +++ b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc
|
| @@ -208,7 +208,8 @@ void BookmarkEditorView::ExecuteCommand(int command_id, int event_flags) {
|
| if (!node)
|
| return;
|
| if (node->value != 0) {
|
| - const BookmarkNode* b_node = bb_model_->GetNodeByID(node->value);
|
| + const BookmarkNode* b_node =
|
| + bookmark_utils::GetNodeByID(bb_model_, node->value);
|
| if (!b_node->empty() &&
|
| !chrome::ConfirmDeleteBookmarkNode(b_node,
|
| GetWidget()->GetNativeWindow())) {
|
| @@ -608,8 +609,11 @@ void BookmarkEditorView::UpdateExpandedNodes(
|
| if (!tree_view_->IsExpanded(editor_node))
|
| return;
|
|
|
| - if (editor_node->value != 0) // The root is 0
|
| - expanded_nodes->insert(bb_model_->GetNodeByID(editor_node->value));
|
| + // The root is 0.
|
| + if (editor_node->value != 0) {
|
| + expanded_nodes->insert(
|
| + bookmark_utils::GetNodeByID(bb_model_, editor_node->value));
|
| + }
|
| for (int i = 0; i < editor_node->child_count(); ++i)
|
| UpdateExpandedNodes(editor_node->GetChild(i), expanded_nodes);
|
| }
|
|
|