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

Unified Diff: chrome/browser/chromeos/login/language_list.cc

Issue 105193002: Replace string16 with base::string16. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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
« no previous file with comments | « chrome/browser/chromeos/login/language_list.h ('k') | chrome/browser/chromeos/login/login_display.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/language_list.cc
diff --git a/chrome/browser/chromeos/login/language_list.cc b/chrome/browser/chromeos/login/language_list.cc
index fa5a671d4465057fcc8fea9e238ea7d9881c0f04..020292eda065ad49e08f1a570752a657821f0f5f 100644
--- a/chrome/browser/chromeos/login/language_list.cc
+++ b/chrome/browser/chromeos/login/language_list.cc
@@ -36,10 +36,10 @@ string16 LanguageList::GetLanguageNameAt(int index) const {
// We must add directionality formatting to both the native name and the
// locale name in order to avoid text rendering problems such as misplaced
// parentheses or languages appearing in the wrong order.
- string16 locale_name = locale_names_[index];
+ base::string16 locale_name = locale_names_[index];
base::i18n::AdjustStringForLocaleDirection(&locale_name);
- string16 native_name = locale_data->second.native_name;
+ base::string16 native_name = locale_data->second.native_name;
base::i18n::AdjustStringForLocaleDirection(&native_name);
// We used to have a localizable template here, but none of translators
@@ -96,9 +96,9 @@ void LanguageList::InitNativeNames(
// TODO(jungshik): Even though these strings are used for the UI,
// the old code does not add an RTL mark for RTL locales. Make sure
// that it's ok without that.
- string16 name_in_current_ui =
+ base::string16 name_in_current_ui =
l10n_util::GetDisplayNameForLocale(locale_code, app_locale, false);
- string16 name_native =
+ base::string16 name_native =
l10n_util::GetDisplayNameForLocale(locale_code, locale_code, false);
locale_names_.push_back(name_in_current_ui);
« no previous file with comments | « chrome/browser/chromeos/login/language_list.h ('k') | chrome/browser/chromeos/login/login_display.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698