Mac: Add a shortcut to open the Apps page from the bookmark bar.

chrome/browser/bookmarks/bookmark_model.h

 // Copyright (c) 2012 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_
 
 #include <set>
 #include <vector>
 
@@ skipping 34 matching lines @@
 
 // BookmarkNode contains information about a starred entry: title, URL, favicon,
 // id and type. BookmarkNodes are returned from BookmarkModel.
 class BookmarkNode : public ui::TreeNode<BookmarkNode> {
  public:
   enum Type {
     URL,
     FOLDER,
     BOOKMARK_BAR,
     OTHER_NODE,
-    MOBILE
+    MOBILE,
+    APPS_NODE
   };
 
   enum FaviconState {
     INVALID_FAVICON,
     LOADING_FAVICON,
     LOADED_FAVICON,
   };
 
   // Creates a new node with an id of 0 and |url|.
   explicit BookmarkNode(const GURL& url);
@@ skipping 31 matching lines @@
   // for folders (including the bookmark bar and other folder).
   const base::Time& date_folder_modified() const {
     return date_folder_modified_;
   }
   void set_date_folder_modified(const base::Time& date) {
     date_folder_modified_ = date;
   }
 
   // Convenience for testing if this node represents a folder. A folder is a
   // node whose type is not URL.
-  bool is_folder() const { return type_ != URL; }
+  bool is_folder() const { return type_ != URL && type_ != APPS_NODE; }
   bool is_url() const { return type_ == URL; }
 
   bool is_favicon_loaded() const { return favicon_state_ == LOADED_FAVICON; }
 
   // Accessor method for controlling the visibility of a bookmark node/sub-tree.
   // Note that visibility is not propagated down the tree hierarchy so if a
   // parent node is marked as invisible, a child node may return "Visible". This
   // function is primarily useful when traversing the model to generate a UI
   // representation but we may want to suppress some nodes.
   virtual bool IsVisible() const;
@@ skipping 130 matching lines @@
 
   // Returns the 'bookmark bar' node. This is NULL until loaded.
   const BookmarkNode* bookmark_bar_node() { return bookmark_bar_node_; }
 
   // Returns the 'other' node. This is NULL until loaded.
   const BookmarkNode* other_node() { return other_node_; }
 
   // Returns the 'mobile' node. This is NULL until loaded.
   const BookmarkNode* mobile_node() { return mobile_node_; }
 
+  // Returns the 'apps' node. This is NULL until loaded or if there is no apps
+  // node.
+  const BookmarkNode* apps_node() { return apps_node_.get(); }
+
   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, 'mobile' node or 'apps' node.
   bool is_permanent_node(const BookmarkNode* node) const {
     return node == &root_ ||
            node == bookmark_bar_node_ ||
            node == other_node_ ||
-           node == mobile_node_;
+           node == mobile_node_ ||
+           node == apps_node_.get();
   }
 
   Profile* profile() { 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();
 
   void AddObserver(BookmarkModelObserver* observer);
   void RemoveObserver(BookmarkModelObserver* observer);
@@ skipping 215 matching lines @@
   bool loaded_;
 
   // The root node. This contains the bookmark bar node and the 'other' node as
   // children.
   BookmarkNode root_;
 
   BookmarkPermanentNode* bookmark_bar_node_;
   BookmarkPermanentNode* other_node_;
   BookmarkPermanentNode* mobile_node_;
 
+  // A special node used to render the bookmark menu but that is not kept under
+  // |root_|, so we have to release it by itself.
+  scoped_ptr<BookmarkPermanentNode> apps_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
   // such, be sure and wrap all usage of it around |url_lock_|.
@@ skipping 13 matching lines @@
 
   // See description of IsDoingExtensiveChanges above.
   int extensive_changes_;
 
   scoped_ptr<BookmarkExpandedStateTracker> expanded_state_tracker_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkModel);
 };
 
 #endif  // CHROME_BROWSER_BOOKMARKS_BOOKMARK_MODEL_H_