From a88fe62cc7255cccd97dc4f13cb6f6f0b5b77fe2 Mon Sep 17 00:00:00 2001 From: "viettrungluu@chromium.org" Date: Sun, 22 Aug 2010 16:49:37 +0000 Subject: 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 --- chrome/browser/default_encoding_combo_model.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'chrome/browser/default_encoding_combo_model.cc') 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) { -- cgit v1.1