diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-30 00:50:04 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-30 00:50:04 +0000 |
| commit | bdaab67c485eee51a098c7b34544c5d18bf725af (patch) | |
| tree | 31e0c087b57c538ef91b6598040f2b7f2293505d /chrome/browser/language_order_table_model.cc | |
| parent | fbc7678b2f73707962861c99eb4c809604ddd611 (diff) | |
| download | chromium_src-bdaab67c485eee51a098c7b34544c5d18bf725af.zip chromium_src-bdaab67c485eee51a098c7b34544c5d18bf725af.tar.gz chromium_src-bdaab67c485eee51a098c7b34544c5d18bf725af.tar.bz2 | |
Remove wstring from TableModel.
BUG=23581
TEST=no visible changes; all tests pass
Review URL: http://codereview.chromium.org/6044007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70290 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/language_order_table_model.cc')
| -rw-r--r-- | chrome/browser/language_order_table_model.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/language_order_table_model.cc b/chrome/browser/language_order_table_model.cc index c1a4103..90501d8 100644 --- a/chrome/browser/language_order_table_model.cc +++ b/chrome/browser/language_order_table_model.cc @@ -39,12 +39,12 @@ void LanguageOrderTableModel::SetObserver(TableModelObserver* observer) { observer_ = observer; } -std::wstring LanguageOrderTableModel::GetText(int row, int column_id) { +string16 LanguageOrderTableModel::GetText(int row, int column_id) { DCHECK(row >= 0 && row < RowCount()); const std::string app_locale = g_browser_process->GetApplicationLocale(); - return UTF16ToWide(l10n_util::GetDisplayNameForLocale(languages_.at(row), - app_locale, - true)); + return l10n_util::GetDisplayNameForLocale(languages_.at(row), + app_locale, + true); } bool LanguageOrderTableModel::Add(const std::string& language) { |