bookmarks: Simplify is_permanent_node() implementation.

chrome/browser/bookmarks/bookmark_model.h

Index: chrome/browser/bookmarks/bookmark_model.h
diff --git a/chrome/browser/bookmarks/bookmark_model.h b/chrome/browser/bookmarks/bookmark_model.h
index 978045a73f080af893a64b514cf7e3a4cd4bedc0..54b01729942f1721899d732771c2d719cefdcdde 100644
--- a/chrome/browser/bookmarks/bookmark_model.h
+++ b/chrome/browser/bookmarks/bookmark_model.h
@@ -196,6 +196,17 @@ class BookmarkModel : public NotificationObserver, public BookmarkService {
   // Returns the 'synced' node. This is NULL until loaded.
   const BookmarkNode* synced_node() { return synced_node_; }
 
+  // Returns whether the given |node| is one of the permanent nodes - root node,
+  // 'bookmark bar' node, 'other' node or 'synced' node.
+  bool is_permanent_node(const BookmarkNode* node) const {
+    return node == &root_ ||
+           node == bookmark_bar_node_ ||
+           node == other_node_ ||
+           node == synced_node_;
+  }
+
+  Profile* profile() const { return profile_; }
+
   // Returns the parent the last node was added to. This never returns NULL
   // (as long as the model is loaded).
   const BookmarkNode* GetParentForNewNodes();
@@ -302,27 +313,6 @@ class BookmarkModel : public NotificationObserver, public BookmarkService {
       size_t max_count,
       std::vector<bookmark_utils::TitleMatch>* matches);
 
-  Profile* profile() const { return profile_; }
-
-  bool is_root(const BookmarkNode* node) const { return node == &root_; }

[sky, 2011/07/29 18:08:27]

Keep is_root. I'm fine with nuking the others.

[tfarina, 2011/07/29 18:22:54]

Done.

-  bool is_bookmark_bar_node(const BookmarkNode* node) const {
-    return node == bookmark_bar_node_;
-  }
-  bool is_synced_bookmarks_node(const BookmarkNode* node) const {
-    return node == synced_node_;
-  }
-  bool is_other_bookmarks_node(const BookmarkNode* node) const {
-    return node == other_node_;
-  }
-  // Returns whether the given node is one of the permanent nodes - root node,
-  // bookmark bar node or other bookmarks node.
-  bool is_permanent_node(const BookmarkNode* node) const {
-    return is_root(node) ||
-           is_bookmark_bar_node(node) ||
-           is_other_bookmarks_node(node) ||
-           is_synced_bookmarks_node(node);
-  }
-
   // Sets the store to NULL, making it so the BookmarkModel does not persist
   // any changes to disk. This is only useful during testing to speed up
   // testing.