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

chrome/browser/bookmarks/bookmark_model.cc

 // 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.
 
 #include "chrome/browser/bookmarks/bookmark_model.h"
 
 #include <algorithm>
 #include <functional>
 
 #include "base/bind.h"
@@ skipping 185 matching lines @@
 
 // BookmarkModel --------------------------------------------------------------
 
 BookmarkModel::BookmarkModel(Profile* profile)
     : profile_(profile),
       loaded_(false),
       root_(GURL()),
       bookmark_bar_node_(NULL),
       other_node_(NULL),
       mobile_node_(NULL),
+      apps_node_(NULL),
       next_node_id_(1),
       observers_(ObserverList<BookmarkModelObserver>::NOTIFY_EXISTING_ONLY),
       loaded_signal_(true, false),
       extensive_changes_(0) {
   if (!profile_) {
     // Profile is null during testing.
     DoneLoading(CreateLoadDetails());
   }
 }
 
@@ skipping 437 matching lines @@
   switch (type) {
     case BookmarkNode::BOOKMARK_BAR:
       bookmark_bar_node_->set_visible(value);
       break;
     case BookmarkNode::OTHER_NODE:
       other_node_->set_visible(value);
       break;
     case BookmarkNode::MOBILE:
       mobile_node_->set_visible(value);
       break;
+    case BookmarkNode::APPS_NODE:
+      apps_node_->set_visible(value);
+      break;
     default:
       NOTREACHED();
   }
 }
 
 bool BookmarkModel::IsBookmarkedNoLock(const GURL& url) {
   BookmarkNode tmp_node(url);
   return (nodes_ordered_by_url_set_.find(&tmp_node) !=
           nodes_ordered_by_url_set_.end());
 }
@@ skipping 52 matching lines @@
   index_.reset(details->release_index());
 
   // WARNING: order is important here, various places assume the order is
   // constant.
   root_.Add(bookmark_bar_node_, 0);
   root_.Add(other_node_, 1);
   root_.Add(mobile_node_, 2);
 
   root_.set_meta_info_str(details->model_meta_info());
 
+  // The apps node does not hold any bookmarks, so it is not obtained from
+  // |details|.  We need it because it is used to render the "Apps" menu item,
+  // but we are careful not to add it to |root_| otherwise it causes problems
+  // with sync.
+  apps_node_.reset(CreatePermanentNode(BookmarkNode::APPS_NODE));
+
   {
     base::AutoLock url_lock(url_lock_);
     // Update nodes_ordered_by_url_set_ from the nodes.
     PopulateNodesByURL(&root_);
   }
 
   loaded_ = true;
 
   loaded_signal_.Signal();
 
@@ skipping 84 matching lines @@
                                  bool allow_end) {
   return (parent && parent->is_folder() &&
           (index >= 0 && (index < parent->child_count() ||
                           (allow_end && index == parent->child_count()))));
 }
 
 BookmarkPermanentNode* BookmarkModel::CreatePermanentNode(
     BookmarkNode::Type type) {
   DCHECK(type == BookmarkNode::BOOKMARK_BAR ||
          type == BookmarkNode::OTHER_NODE ||
-         type == BookmarkNode::MOBILE);
+         type == BookmarkNode::MOBILE ||
+         type == BookmarkNode::APPS_NODE);
   BookmarkPermanentNode* node =
       new BookmarkPermanentNode(generate_next_node_id());
   if (type == BookmarkNode::MOBILE)
     node->set_visible(false);  // Mobile node is initially hidden.
 
   int title_id;
   switch (type) {
     case BookmarkNode::BOOKMARK_BAR:
       title_id = IDS_BOOKMARK_BAR_FOLDER_NAME;
       break;
     case BookmarkNode::OTHER_NODE:
       title_id = IDS_BOOKMARK_BAR_OTHER_FOLDER_NAME;
       break;
     case BookmarkNode::MOBILE:
       title_id = IDS_BOOKMARK_BAR_MOBILE_FOLDER_NAME;
       break;
+    case BookmarkNode::APPS_NODE:
+      title_id = IDS_BOOKMARK_BAR_APPS_SHORTCUT_NAME;
+      break;
     default:
       NOTREACHED();
       title_id = IDS_BOOKMARK_BAR_FOLDER_NAME;
       break;
   }
   node->SetTitle(l10n_util::GetStringUTF16(title_id));
   node->set_type(type);
   return node;
 }
 
@@ skipping 88 matching lines @@
   BookmarkPermanentNode* bb_node =
       CreatePermanentNode(BookmarkNode::BOOKMARK_BAR);
   BookmarkPermanentNode* other_node =
       CreatePermanentNode(BookmarkNode::OTHER_NODE);
   BookmarkPermanentNode* mobile_node =
       CreatePermanentNode(BookmarkNode::MOBILE);
   return new BookmarkLoadDetails(bb_node, other_node, mobile_node,
                                  new BookmarkIndex(profile_),
                                  next_node_id_);
 }