Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1413)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/language_order_table_model.cc

Issue 6044007: Remove wstring from TableModel.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 10 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« chrome/browser/dom_ui/options/add_startup_page_handler.cc ('K') | « chrome/browser/language_order_table_model.h ('k') | chrome/browser/notifications/notification_exceptions_table_model.h » ('j') | chrome/browser/notifications/notification_exceptions_table_model.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/language_order_table_model.cc
===================================================================
--- chrome/browser/language_order_table_model.cc (revision 70272)
+++ chrome/browser/language_order_table_model.cc (working copy)
@@ -39,12 +39,12 @@
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) {
« chrome/browser/dom_ui/options/add_startup_page_handler.cc ('K') | « chrome/browser/language_order_table_model.h ('k') | chrome/browser/notifications/notification_exceptions_table_model.h » ('j') | chrome/browser/notifications/notification_exceptions_table_model.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698