Index: chrome/browser/bookmarks/bookmark_model.cc |
diff --git a/chrome/browser/bookmarks/bookmark_model.cc b/chrome/browser/bookmarks/bookmark_model.cc |
index 52533b4c2be72210353f7fc5c17cb7d33441eae5..cc2ef56361d2274bd5819ab551bda6cc89d8acb2 100644 |
--- a/chrome/browser/bookmarks/bookmark_model.cc |
+++ b/chrome/browser/bookmarks/bookmark_model.cc |
@@ -203,6 +203,7 @@ BookmarkModel::BookmarkModel(Profile* profile) |
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), |
@@ -660,6 +661,9 @@ void BookmarkModel::SetPermanentNodeVisible(BookmarkNode::Type type, |
case BookmarkNode::MOBILE: |
mobile_node_->set_visible(value); |
break; |
+ case BookmarkNode::APPS_NODE: |
+ apps_node_->set_visible(value); |
+ break; |
default: |
NOTREACHED(); |
} |
@@ -732,6 +736,12 @@ void BookmarkModel::DoneLoading(BookmarkLoadDetails* details_delete_me) { |
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. |
@@ -836,7 +846,8 @@ 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) |
@@ -853,6 +864,9 @@ BookmarkPermanentNode* BookmarkModel::CreatePermanentNode( |
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; |