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

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

Issue 6307015: Fix a bug where we were showing a wrong language name on the OOBE screen. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: reorder Created 9 years, 11 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/wizard_controller.cc
diff --git a/chrome/browser/chromeos/login/wizard_controller.cc b/chrome/browser/chromeos/login/wizard_controller.cc
index 5bc99f38c26b243a728aa8b94eecd1a0f8a0b25f..9eecdabdaf9bf87003407dc964d83ad431f56edd 100644
--- a/chrome/browser/chromeos/login/wizard_controller.cc
+++ b/chrome/browser/chromeos/login/wizard_controller.cc
@@ -964,6 +964,9 @@ void ShowLoginWizard(const std::string& first_screen_name,
ResourceBundle::ReloadSharedInstance(locale);
CHECK(!loaded_locale.empty()) << "Locale could not be found for "
<< locale;
+ // Set the application locale here so that the language switch
+ // menu works properly with the newly loaded locale.
+ g_browser_process->SetApplicationLocale(loaded_locale);
}
}
}
@@ -977,9 +980,6 @@ void ShowLoginWizard(const std::string& first_screen_name,
chromeos::CrosLibrary::Get()->GetLoginLibrary()->EmitLoginPromptReady();
if (controller->GetCustomization()) {
- if (!locale.empty())
- chromeos::LanguageSwitchMenu::SwitchLanguage(locale);
-
// Set initial timezone if specified by customization.
const std::string timezone_name =
controller->GetCustomization()->initial_timezone();
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698