| Index: chrome/browser/chromeos/login/language_switch_menu.cc
|
| diff --git a/chrome/browser/chromeos/login/language_switch_menu.cc b/chrome/browser/chromeos/login/language_switch_menu.cc
|
| index c18d20da42d4925457a8c879dde0b1c298a28df1..5e25f232e5907be8ae42a840185d05d32a90eb9d 100644
|
| --- a/chrome/browser/chromeos/login/language_switch_menu.cc
|
| +++ b/chrome/browser/chromeos/login/language_switch_menu.cc
|
| @@ -67,8 +67,9 @@ void LanguageSwitchMenu::InitLanguageMenu() {
|
| std::wstring LanguageSwitchMenu::GetCurrentLocaleName() const {
|
| DCHECK(g_browser_process);
|
| const std::string locale = g_browser_process->GetApplicationLocale();
|
| - return language_list_->GetLanguageNameAt(
|
| - language_list_->GetIndexFromLocale(locale));
|
| + int index = language_list_->GetIndexFromLocale(locale);
|
| + CHECK_NE(-1, index) << "Unknown locale: " << locale;
|
| + return language_list_->GetLanguageNameAt(index);
|
| };
|
|
|
| void LanguageSwitchMenu::SetFirstLevelMenuWidth(int width) {
|
| @@ -93,7 +94,9 @@ void LanguageSwitchMenu::SwitchLanguage(const std::string& locale) {
|
| prefs->SavePersistentPrefs();
|
|
|
| // Switch the locale.
|
| - ResourceBundle::ReloadSharedInstance(locale);
|
| + const std::string loaded_locale =
|
| + ResourceBundle::ReloadSharedInstance(locale);
|
| + CHECK(!loaded_locale.empty()) << "Locale could not be found for " << locale;
|
|
|
| // Enable the keyboard layouts that are necessary for the new locale.
|
| input_method::EnableInputMethods(
|
|
|