Index: ui/base/l10n/l10n_util_win.cc |
diff --git a/ui/base/l10n/l10n_util_win.cc b/ui/base/l10n/l10n_util_win.cc |
index 4b91fa229bb87e235abee48bd7ba4620f7a98668..cd0a084a474f6ac90fce90c971dee9b652511918 100644 |
--- a/ui/base/l10n/l10n_util_win.cc |
+++ b/ui/base/l10n/l10n_util_win.cc |
@@ -11,6 +11,7 @@ |
#include "base/i18n/rtl.h" |
#include "base/lazy_instance.h" |
#include "base/strings/string_number_conversions.h" |
+#include "base/strings/utf_string_conversions.h" |
#include "base/win/i18n.h" |
#include "base/win/windows_version.h" |
#include "grit/app_locale_settings.h" |
@@ -185,12 +186,12 @@ void AdjustUIFontForWindow(HWND hwnd) { |
} |
void OverrideLocaleWithUILanguageList() { |
- std::vector<std::wstring> ui_languages; |
+ std::vector<base::string16> ui_languages; |
if (base::win::i18n::GetThreadPreferredUILanguageList(&ui_languages)) { |
std::vector<std::string> ascii_languages; |
ascii_languages.reserve(ui_languages.size()); |
std::transform(ui_languages.begin(), ui_languages.end(), |
- std::back_inserter(ascii_languages), &WideToASCII); |
+ std::back_inserter(ascii_languages), &base::UTF16ToASCII); |
override_locale_holder.Get().swap_value(&ascii_languages); |
} else { |
NOTREACHED() << "Failed to determine the UI language for locale override."; |