Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(79)

Side by Side Diff: chrome/browser/bookmarks/recently_used_folders_combo_model.cc

Issue 8772064: Adds back BookmarkNode::IsVisible. Turns out we want to conditionally (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Tweaks Created 9 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/bookmarks/recently_used_folders_combo_model.h" 5 #include "chrome/browser/bookmarks/recently_used_folders_combo_model.h"
6 6
7 #include "chrome/browser/bookmarks/bookmark_utils.h" 7 #include "chrome/browser/bookmarks/bookmark_utils.h"
8 #include "grit/generated_resources.h" 8 #include "grit/generated_resources.h"
9 #include "ui/base/l10n/l10n_util.h" 9 #include "ui/base/l10n/l10n_util.h"
10 10
(...skipping 25 matching lines...) Expand all
36 if (!model->is_permanent_node(node->parent())) 36 if (!model->is_permanent_node(node->parent()))
37 nodes_.insert(nodes_.begin(), node->parent()); 37 nodes_.insert(nodes_.begin(), node->parent());
38 38
39 // Make sure we only have kMaxMRUFolders in the first chunk. 39 // Make sure we only have kMaxMRUFolders in the first chunk.
40 if (nodes_.size() > kMaxMRUFolders) 40 if (nodes_.size() > kMaxMRUFolders)
41 nodes_.erase(nodes_.begin() + kMaxMRUFolders, nodes_.end()); 41 nodes_.erase(nodes_.begin() + kMaxMRUFolders, nodes_.end());
42 42
43 // And put the bookmark bar and other nodes at the end of the list. 43 // And put the bookmark bar and other nodes at the end of the list.
44 nodes_.push_back(model->bookmark_bar_node()); 44 nodes_.push_back(model->bookmark_bar_node());
45 nodes_.push_back(model->other_node()); 45 nodes_.push_back(model->other_node());
46 nodes_.push_back(model->mobile_node()); 46 if (model->mobile_node()->IsVisible())
47 nodes_.push_back(model->mobile_node());
47 48
48 std::vector<const BookmarkNode*>::iterator it = std::find(nodes_.begin(), 49 std::vector<const BookmarkNode*>::iterator it = std::find(nodes_.begin(),
49 nodes_.end(), 50 nodes_.end(),
50 node->parent()); 51 node->parent());
51 node_parent_index_ = static_cast<int>(it - nodes_.begin()); 52 node_parent_index_ = static_cast<int>(it - nodes_.begin());
52 } 53 }
53 54
54 RecentlyUsedFoldersComboModel::~RecentlyUsedFoldersComboModel() {} 55 RecentlyUsedFoldersComboModel::~RecentlyUsedFoldersComboModel() {}
55 56
56 int RecentlyUsedFoldersComboModel::GetItemCount() { 57 int RecentlyUsedFoldersComboModel::GetItemCount() {
(...skipping 13 matching lines...) Expand all
70 return nodes_[index]; 71 return nodes_[index];
71 } 72 }
72 73
73 void RecentlyUsedFoldersComboModel::RemoveNode(const BookmarkNode* node) { 74 void RecentlyUsedFoldersComboModel::RemoveNode(const BookmarkNode* node) {
74 std::vector<const BookmarkNode*>::iterator it = std::find(nodes_.begin(), 75 std::vector<const BookmarkNode*>::iterator it = std::find(nodes_.begin(),
75 nodes_.end(), 76 nodes_.end(),
76 node); 77 node);
77 if (it != nodes_.end()) 78 if (it != nodes_.end())
78 nodes_.erase(it); 79 nodes_.erase(it);
79 } 80 }
OLDNEW
« no previous file with comments | « chrome/browser/bookmarks/bookmark_utils.cc ('k') | chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698