| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/ui/bookmarks/recently_used_folders_combo_model.h" | 5 #include "chrome/browser/ui/bookmarks/recently_used_folders_combo_model.h" |
| 6 | 6 |
| 7 #include "components/bookmarks/browser/bookmark_model.h" | 7 #include "components/bookmarks/browser/bookmark_model.h" |
| 8 #include "components/bookmarks/browser/bookmark_utils.h" | 8 #include "components/bookmarks/browser/bookmark_utils.h" |
| 9 #include "content/public/browser/user_metrics.h" | 9 #include "content/public/browser/user_metrics.h" |
| 10 #include "grit/generated_resources.h" | 10 #include "grit/generated_resources.h" |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 47 } | 47 } |
| 48 | 48 |
| 49 RecentlyUsedFoldersComboModel::RecentlyUsedFoldersComboModel( | 49 RecentlyUsedFoldersComboModel::RecentlyUsedFoldersComboModel( |
| 50 BookmarkModel* model, | 50 BookmarkModel* model, |
| 51 const BookmarkNode* node) | 51 const BookmarkNode* node) |
| 52 : bookmark_model_(model), | 52 : bookmark_model_(model), |
| 53 node_parent_index_(0) { | 53 node_parent_index_(0) { |
| 54 bookmark_model_->AddObserver(this); | 54 bookmark_model_->AddObserver(this); |
| 55 // Use + 2 to account for bookmark bar and other node. | 55 // Use + 2 to account for bookmark bar and other node. |
| 56 std::vector<const BookmarkNode*> nodes = | 56 std::vector<const BookmarkNode*> nodes = |
| 57 bookmark_utils::GetMostRecentlyModifiedUserFolders(model, | 57 bookmarks::GetMostRecentlyModifiedUserFolders(model, kMaxMRUFolders + 2); |
| 58 kMaxMRUFolders + 2); | |
| 59 | 58 |
| 60 for (size_t i = 0; i < nodes.size(); ++i) | 59 for (size_t i = 0; i < nodes.size(); ++i) |
| 61 items_.push_back(Item(nodes[i], Item::TYPE_NODE)); | 60 items_.push_back(Item(nodes[i], Item::TYPE_NODE)); |
| 62 | 61 |
| 63 // We special case the placement of these, so remove them from the list, then | 62 // We special case the placement of these, so remove them from the list, then |
| 64 // fix up the order. | 63 // fix up the order. |
| 65 RemoveNode(model->bookmark_bar_node()); | 64 RemoveNode(model->bookmark_bar_node()); |
| 66 RemoveNode(model->mobile_node()); | 65 RemoveNode(model->mobile_node()); |
| 67 RemoveNode(model->other_node()); | 66 RemoveNode(model->other_node()); |
| 68 RemoveNode(node->parent()); | 67 RemoveNode(node->parent()); |
| (...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 241 return items_[index].node; | 240 return items_[index].node; |
| 242 } | 241 } |
| 243 | 242 |
| 244 void RecentlyUsedFoldersComboModel::RemoveNode(const BookmarkNode* node) { | 243 void RecentlyUsedFoldersComboModel::RemoveNode(const BookmarkNode* node) { |
| 245 std::vector<Item>::iterator it = std::find(items_.begin(), | 244 std::vector<Item>::iterator it = std::find(items_.begin(), |
| 246 items_.end(), | 245 items_.end(), |
| 247 Item(node, Item::TYPE_NODE)); | 246 Item(node, Item::TYPE_NODE)); |
| 248 if (it != items_.end()) | 247 if (it != items_.end()) |
| 249 items_.erase(it); | 248 items_.erase(it); |
| 250 } | 249 } |
| OLD | NEW |