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

Unified Diff: chrome/browser/chromeos/base/locale_util.cc

Issue 224093013: Allow country-specific languages in UI list at OOBE. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Support en-AU locale. Created 6 years, 8 months 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
Index: chrome/browser/chromeos/base/locale_util.cc
diff --git a/chrome/browser/chromeos/base/locale_util.cc b/chrome/browser/chromeos/base/locale_util.cc
index cfbb1b0a3ee3ab12f8ee78894086356ed7178082..4250f8da39c4aac77e26d34b21c4c135fc7bd35e 100644
--- a/chrome/browser/chromeos/base/locale_util.cc
+++ b/chrome/browser/chromeos/base/locale_util.cc
@@ -64,7 +64,7 @@ void FinishSwitchLanguage(scoped_ptr<SwitchLanguageData> data) {
input_method::InputMethodManager* manager =
input_method::InputMethodManager::Get();
manager->EnableLoginLayouts(
- data->locale,
+ data->loaded_locale,
manager->GetInputMethodUtil()->GetHardwareLoginInputMethodIds());
if (!data->login_layouts_only) {
// Enable all the other layouts
@@ -72,7 +72,9 @@ void FinishSwitchLanguage(scoped_ptr<SwitchLanguageData> data) {
input_method::InputMethodUtil* util = manager->GetInputMethodUtil();
// Add input methods associated with the language.
util->GetInputMethodIdsFromLanguageCode(
- data->locale, input_method::kKeyboardLayoutsOnly, &candidates);
+ data->loaded_locale,
+ input_method::kKeyboardLayoutsOnly,
+ &candidates);
for (std::vector<std::string>::const_iterator i = candidates.begin();
i != candidates.end();
++i)

Powered by Google App Engine
This is Rietveld 408576698