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

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

Issue 9838092: ui/base/models: Make ComboboxModel::GetItemCount() a constant function. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix win_rel and reland Created 8 years, 9 months 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) 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/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
11 namespace { 11 namespace {
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 nodes_.push_back(model->mobile_node()); 47 nodes_.push_back(model->mobile_node());
48 48
49 std::vector<const BookmarkNode*>::iterator it = std::find(nodes_.begin(), 49 std::vector<const BookmarkNode*>::iterator it = std::find(nodes_.begin(),
50 nodes_.end(), 50 nodes_.end(),
51 node->parent()); 51 node->parent());
52 node_parent_index_ = static_cast<int>(it - nodes_.begin()); 52 node_parent_index_ = static_cast<int>(it - nodes_.begin());
53 } 53 }
54 54
55 RecentlyUsedFoldersComboModel::~RecentlyUsedFoldersComboModel() {} 55 RecentlyUsedFoldersComboModel::~RecentlyUsedFoldersComboModel() {}
56 56
57 int RecentlyUsedFoldersComboModel::GetItemCount() { 57 int RecentlyUsedFoldersComboModel::GetItemCount() const {
58 return static_cast<int>(nodes_.size() + 1); 58 return static_cast<int>(nodes_.size() + 1);
59 } 59 }
60 60
61 string16 RecentlyUsedFoldersComboModel::GetItemAt(int index) { 61 string16 RecentlyUsedFoldersComboModel::GetItemAt(int index) {
62 if (index == static_cast<int>(nodes_.size())) 62 if (index == static_cast<int>(nodes_.size()))
63 return 63 return
64 l10n_util::GetStringUTF16(IDS_BOOKMARK_BUBBLE_CHOOSER_ANOTHER_FOLDER); 64 l10n_util::GetStringUTF16(IDS_BOOKMARK_BUBBLE_CHOOSER_ANOTHER_FOLDER);
65 return nodes_[index]->GetTitle(); 65 return nodes_[index]->GetTitle();
66 } 66 }
67 67
68 const BookmarkNode* RecentlyUsedFoldersComboModel::GetNodeAt(int index) { 68 const BookmarkNode* RecentlyUsedFoldersComboModel::GetNodeAt(int index) {
69 if (index < 0 || index >= static_cast<int>(nodes_.size())) 69 if (index < 0 || index >= static_cast<int>(nodes_.size()))
70 return NULL; 70 return NULL;
71 return nodes_[index]; 71 return nodes_[index];
72 } 72 }
73 73
74 void RecentlyUsedFoldersComboModel::RemoveNode(const BookmarkNode* node) { 74 void RecentlyUsedFoldersComboModel::RemoveNode(const BookmarkNode* node) {
75 std::vector<const BookmarkNode*>::iterator it = std::find(nodes_.begin(), 75 std::vector<const BookmarkNode*>::iterator it = std::find(nodes_.begin(),
76 nodes_.end(), 76 nodes_.end(),
77 node); 77 node);
78 if (it != nodes_.end()) 78 if (it != nodes_.end())
79 nodes_.erase(it); 79 nodes_.erase(it);
80 } 80 }
OLDNEW
« no previous file with comments | « chrome/browser/bookmarks/recently_used_folders_combo_model.h ('k') | chrome/browser/chromeos/options/vpn_config_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698