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

Unified Diff: components/bookmarks/browser/bookmark_model.h

Issue 305973004: BookmarkClient can add extra nodes to BookmarkModel. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: renamed methods Created 6 years, 6 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: components/bookmarks/browser/bookmark_model.h
diff --git a/components/bookmarks/browser/bookmark_model.h b/components/bookmarks/browser/bookmark_model.h
index e4aacf28b8fb53bdb808d19983fcd76288d73b5a..ab8ee5a8ed2f974b50f0b20532771b3c0d9e3734 100644
--- a/components/bookmarks/browser/bookmark_model.h
+++ b/components/bookmarks/browser/bookmark_model.h
@@ -98,12 +98,10 @@ class BookmarkModel : public BookmarkService {
bool is_root_node(const BookmarkNode* node) const { return node == &root_; }
// Returns whether the given |node| is one of the permanent nodes - root node,
- // 'bookmark bar' node, 'other' node or 'mobile' node.
+ // 'bookmark bar' node, 'other' node or 'mobile' node, or one of the root
+ // nodes supplied by the |client_|.
bool is_permanent_node(const BookmarkNode* node) const {
- return node == &root_ ||
- node == bookmark_bar_node_ ||
- node == other_node_ ||
- node == mobile_node_;
+ return node && (node == &root_ || node->parent() == &root_);
}
// Returns the parent the last node was added to. This never returns NULL

Powered by Google App Engine
This is Rietveld 408576698