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/default_encoding_combo_model.cc | |
| 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/default_encoding_combo_model.cc')
| -rw-r--r-- | chrome/browser/default_encoding_combo_model.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/default_encoding_combo_model.cc b/chrome/browser/default_encoding_combo_model.cc index 83477b8..29a819a 100644 --- a/chrome/browser/default_encoding_combo_model.cc +++ b/chrome/browser/default_encoding_combo_model.cc @@ -6,6 +6,7 @@ #include "app/l10n_util.h" #include "app/l10n_util_collator.h" +#include "base/utf_string_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/pref_member.h" #include "chrome/browser/profile.h" @@ -23,9 +24,9 @@ DefaultEncodingComboboxModel::DefaultEncodingComboboxModel() { l10n_util::SortVectorWithStringKey(locale, &sorted_encoding_list_, true); } -std::wstring DefaultEncodingComboboxModel::GetItemAt(int index) { +string16 DefaultEncodingComboboxModel::GetItemAt(int index) { DCHECK(index >= 0 && index < GetItemCount()); - return sorted_encoding_list_[index].encoding_display_name; + return WideToUTF16Hack(sorted_encoding_list_[index].encoding_display_name); } std::string DefaultEncodingComboboxModel::GetEncodingCharsetByIndex(int index) { |