Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(195)

Unified Diff: chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc

Issue 242823002: Extract GetNodeByID() method from BookmarkModel. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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);
}

Powered by Google App Engine
This is Rietveld 408576698