Makes all permanent nodes share the same node class so that visibility

chrome/browser/bookmarks/bookmark_model.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_BOOKMARKS_BOOKMARK_MODEL_H_
 #define CHROME_BROWSER_BOOKMARKS_BOOKMARK_MODEL_H_
 #pragma once
 
 #include <set>
 #include <vector>
@@ skipping 140 matching lines @@
   // Whether the favicon has been loaded.
   bool is_favicon_loaded_;
 
   // If non-zero, it indicates we're loading the favicon and this is the handle
   // from the HistoryService.
   HistoryService::Handle favicon_load_handle_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkNode);
 };
 
+// BookmarkPermanentNode -------------------------------------------------------
+
+// Node used for the permanent folders (excluding the root).
+class BookmarkPermanentNode : public BookmarkNode {

[noyau (Ping after 24h), 2011/12/09 15:54:35]

BookmarkPermanentNode doesn't need to be defined here, a forward declaration
would be sufficient with the definition in the implementation file.

[sky, 2011/12/09 17:57:04]

That's problematic because bookmark_bar_node_ is now of type
BookmarkPermanentNode but the getter returns BookmarkNode. Without this in the
header the compiler wouldn't be able to figure out BookmarkPermanentNode is a
BookmarkNode.

+ public:
+  explicit BookmarkPermanentNode(int64 id);
+  virtual ~BookmarkPermanentNode();
+
+  // WARNING: this code is used for other projects. Contact noyau@ for details.
+  void set_visible(bool value) { visible_ = value; }
+
+  // BookmarkNode overrides:
+  virtual bool IsVisible() const OVERRIDE;
+
+ private:
+  bool visible_;
+
+  DISALLOW_COPY_AND_ASSIGN(BookmarkPermanentNode);
+};
+
 // BookmarkModel --------------------------------------------------------------
 
 // BookmarkModel provides a directed acyclic graph of URLs and folders.
 // Three graphs are provided for the three entry points: those on the 'bookmarks
 // bar', those in the 'other bookmarks' folder and those in the 'mobile' folder.
 //
 // An observer may be attached to observe relevant events.
 //
 // You should NOT directly create a BookmarkModel, instead go through the
 // Profile.
@@ skipping 151 matching lines @@
 
   // Returns the next node ID.
   int64 next_node_id() const { return next_node_id_; }
 
   // Returns the object responsible for tracking the set of expanded nodes in
   // the bookmark editor.
   BookmarkExpandedStateTracker* expanded_state_tracker() {
     return expanded_state_tracker_.get();
   }
 
-  // Sets whether the mobile folder is visible. This is set by sync.
-  void SetMobileFolderVisible(bool value);
+  // Sets the visibility of one of the permanent nodes. This is set by sync.
+  void SetPermanentNodeVisible(BookmarkNode::Type type, bool value);
 
  private:
   friend class BookmarkCodecTest;
   friend class BookmarkModelTest;
   friend class BookmarkStorage;
 
   // Used to order BookmarkNodes by URL.
   class NodeURLComparator {
    public:
     bool operator()(const BookmarkNode* n1, const BookmarkNode* n2) const {
@@ skipping 31 matching lines @@
                         bool was_bookmarked);
 
   // Implementation of GetNodeByID.
   const BookmarkNode* GetNodeByID(const BookmarkNode* node, int64 id) const;
 
   // Returns true if the parent and index are valid.
   bool IsValidIndex(const BookmarkNode* parent, int index, bool allow_end);
 
   // Creates one of the possible permanent nodes (bookmark bar node, other node
   // and mobile node) from |type|.
-  BookmarkNode* CreatePermanentNode(BookmarkNode::Type type);
+  BookmarkPermanentNode* CreatePermanentNode(BookmarkNode::Type type);
 
   // Notification that a favicon has finished loading. If we can decode the
   // favicon, FaviconLoaded is invoked.
   void OnFaviconDataAvailable(FaviconService::Handle handle,
                               history::FaviconData favicon);
 
   // Invoked from the node to load the favicon. Requests the favicon from the
   // favicon service.
   void LoadFavicon(BookmarkNode* node);
 
@@ skipping 28 matching lines @@
   bool loaded_;
 
   // Whether the bookmarks file was changed externally. This is set after
   // loading is complete and once set the value never changes.
   bool file_changed_;
 
   // The root node. This contains the bookmark bar node and the 'other' node as
   // children.
   BookmarkNode root_;
 
-  BookmarkNode* bookmark_bar_node_;
-  BookmarkNode* other_node_;
-  BookmarkNode* mobile_node_;
+  BookmarkPermanentNode* bookmark_bar_node_;
+  BookmarkPermanentNode* other_node_;
+  BookmarkPermanentNode* mobile_node_;
 
   // The maximum ID assigned to the bookmark nodes in the model.
   int64 next_node_id_;
 
   // The observers.
   ObserverList<BookmarkModelObserver> observers_;
 
   // Set of nodes ordered by URL. This is not a map to avoid copying the
   // urls.
   // WARNING: |nodes_ordered_by_url_set_| is accessed on multiple threads. As
@@ skipping 11 matching lines @@
   scoped_ptr<BookmarkIndex> index_;
 
   base::WaitableEvent loaded_signal_;
 
   scoped_ptr<BookmarkExpandedStateTracker> expanded_state_tracker_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkModel);
 };
 
 #endif  // CHROME_BROWSER_BOOKMARKS_BOOKMARK_MODEL_H_