diff options
author | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-22 16:49:37 +0000 |
---|---|---|
committer | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-22 16:49:37 +0000 |
commit | a88fe62cc7255cccd97dc4f13cb6f6f0b5b77fe2 (patch) | |
tree | e05c5e6959584c84cef55647d9bf1e4bbb2217d9 /chrome/browser/bookmarks | |
parent | e7afe2458ed03e907601cd3c05dc5f253f824d88 (diff) | |
download | chromium_src-a88fe62cc7255cccd97dc4f13cb6f6f0b5b77fe2.zip chromium_src-a88fe62cc7255cccd97dc4f13cb6f6f0b5b77fe2.tar.gz chromium_src-a88fe62cc7255cccd97dc4f13cb6f6f0b5b77fe2.tar.bz2 |
Remove wstrings from bookmarks, part 12.
- This changes RecentlyUsedFoldersComboModel::GetItemAt() to return a string16
instead of a wstring.
- This entailed changing the base class, ComboboxModel, and shaving a herd of
yaks.
BUG=23581
TEST=builds and passes tests
Review URL: http://codereview.chromium.org/3159031
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57021 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/bookmarks')
-rw-r--r-- | chrome/browser/bookmarks/recently_used_folders_combo_model.cc | 6 | ||||
-rw-r--r-- | chrome/browser/bookmarks/recently_used_folders_combo_model.h | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/chrome/browser/bookmarks/recently_used_folders_combo_model.cc b/chrome/browser/bookmarks/recently_used_folders_combo_model.cc index cd6bfc1..529a6ae 100644 --- a/chrome/browser/bookmarks/recently_used_folders_combo_model.cc +++ b/chrome/browser/bookmarks/recently_used_folders_combo_model.cc @@ -53,10 +53,10 @@ int RecentlyUsedFoldersComboModel::GetItemCount() { return static_cast<int>(nodes_.size() + 1); } -std::wstring RecentlyUsedFoldersComboModel::GetItemAt(int index) { +string16 RecentlyUsedFoldersComboModel::GetItemAt(int index) { if (index == static_cast<int>(nodes_.size())) - return l10n_util::GetString(IDS_BOOMARK_BUBBLE_CHOOSER_ANOTHER_FOLDER); - return nodes_[index]->GetTitle(); + return l10n_util::GetStringUTF16(IDS_BOOMARK_BUBBLE_CHOOSER_ANOTHER_FOLDER); + return nodes_[index]->GetTitleAsString16(); } const BookmarkNode* RecentlyUsedFoldersComboModel::GetNodeAt(int index) { diff --git a/chrome/browser/bookmarks/recently_used_folders_combo_model.h b/chrome/browser/bookmarks/recently_used_folders_combo_model.h index 21bd9b7..adf36a9 100644 --- a/chrome/browser/bookmarks/recently_used_folders_combo_model.h +++ b/chrome/browser/bookmarks/recently_used_folders_combo_model.h @@ -9,6 +9,7 @@ #include <vector> #include "app/combobox_model.h" +#include "base/string16.h" #include "chrome/browser/bookmarks/bookmark_model.h" // Model for the combobox showing the list of folders to choose from. The @@ -20,7 +21,7 @@ class RecentlyUsedFoldersComboModel : public ComboboxModel { // Overridden from ComboboxModel: virtual int GetItemCount(); - virtual std::wstring GetItemAt(int index); + virtual string16 GetItemAt(int index); // Returns the node at the specified |index|. const BookmarkNode* GetNodeAt(int index); |