| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 "app/l10n_util.h" | 7 #include "app/l10n_util.h" |
| 8 #include "chrome/browser/bookmarks/bookmark_utils.h" | 8 #include "chrome/browser/bookmarks/bookmark_utils.h" |
| 9 #include "grit/generated_resources.h" | 9 #include "grit/generated_resources.h" |
| 10 | 10 |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 46 std::vector<const BookmarkNode*>::iterator it = std::find(nodes_.begin(), | 46 std::vector<const BookmarkNode*>::iterator it = std::find(nodes_.begin(), |
| 47 nodes_.end(), | 47 nodes_.end(), |
| 48 node->GetParent()); | 48 node->GetParent()); |
| 49 node_parent_index_ = static_cast<int>(it - nodes_.begin()); | 49 node_parent_index_ = static_cast<int>(it - nodes_.begin()); |
| 50 } | 50 } |
| 51 | 51 |
| 52 int RecentlyUsedFoldersComboModel::GetItemCount() { | 52 int RecentlyUsedFoldersComboModel::GetItemCount() { |
| 53 return static_cast<int>(nodes_.size() + 1); | 53 return static_cast<int>(nodes_.size() + 1); |
| 54 } | 54 } |
| 55 | 55 |
| 56 std::wstring RecentlyUsedFoldersComboModel::GetItemAt(int index) { | 56 string16 RecentlyUsedFoldersComboModel::GetItemAt(int index) { |
| 57 if (index == static_cast<int>(nodes_.size())) | 57 if (index == static_cast<int>(nodes_.size())) |
| 58 return l10n_util::GetString(IDS_BOOMARK_BUBBLE_CHOOSER_ANOTHER_FOLDER); | 58 return l10n_util::GetStringUTF16(IDS_BOOMARK_BUBBLE_CHOOSER_ANOTHER_FOLDER); |
| 59 return nodes_[index]->GetTitle(); | 59 return nodes_[index]->GetTitleAsString16(); |
| 60 } | 60 } |
| 61 | 61 |
| 62 const BookmarkNode* RecentlyUsedFoldersComboModel::GetNodeAt(int index) { | 62 const BookmarkNode* RecentlyUsedFoldersComboModel::GetNodeAt(int index) { |
| 63 if (index < 0 || index >= static_cast<int>(nodes_.size())) | 63 if (index < 0 || index >= static_cast<int>(nodes_.size())) |
| 64 return NULL; | 64 return NULL; |
| 65 return nodes_[index]; | 65 return nodes_[index]; |
| 66 } | 66 } |
| 67 | 67 |
| 68 void RecentlyUsedFoldersComboModel::RemoveNode(const BookmarkNode* node) { | 68 void RecentlyUsedFoldersComboModel::RemoveNode(const BookmarkNode* node) { |
| 69 std::vector<const BookmarkNode*>::iterator it = std::find(nodes_.begin(), | 69 std::vector<const BookmarkNode*>::iterator it = std::find(nodes_.begin(), |
| 70 nodes_.end(), | 70 nodes_.end(), |
| 71 node); | 71 node); |
| 72 if (it != nodes_.end()) | 72 if (it != nodes_.end()) |
| 73 nodes_.erase(it); | 73 nodes_.erase(it); |
| 74 } | 74 } |
| OLD | NEW |