Error handling added

chrome/browser/chromeos/login/language_switch_menu.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/login/language_switch_menu.h"
 
 #include "app/resource_bundle.h"
 #include "base/i18n/rtl.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 49 matching lines @@
         line, WideToUTF16(language_list_->GetLanguageNameAt(line)));
   }
 
   // Initialize menu here so it appears fast when called.
   menu_.reset(new views::Menu2(&menu_model_));
 }
 
 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(index, -1) << "Unknown locale: " << locale;

[Peter Kasting, 2010/12/21 18:35:58]

Nit: (expected, actual)

[glotov, 2010/12/21 20:33:34]

Done.

+  return language_list_->GetLanguageNameAt(index);
 };
 
 void LanguageSwitchMenu::SetFirstLevelMenuWidth(int width) {
   DCHECK(menu_ != NULL);
   menu_->SetMinimumWidth(width);
 }
 
 // static
 void LanguageSwitchMenu::SwitchLanguage(const std::string& locale) {
   DCHECK(g_browser_process);
   if (g_browser_process->GetApplicationLocale() == locale) {
     return;
   }
   // Save new locale.
   PrefService* prefs = g_browser_process->local_state();
   // TODO(markusheintz): If the preference is managed and can not be changed by
   // the user, changing the language should be disabled in the UI.
   // TODO(markusheintz): Change the if condition to prefs->IsUserModifiable()
   // once Mattias landed his pending patch.
   if (!prefs->IsManagedPreference(prefs::kApplicationLocale)) {
     prefs->SetString(prefs::kApplicationLocale, locale);
     prefs->SavePersistentPrefs();
 
     // Switch the locale.
-    ResourceBundle::ReloadSharedInstance(locale);
+    const std::string res = ResourceBundle::ReloadSharedInstance(locale);

[Peter Kasting, 2010/12/21 18:35:58]

Nit: Same nits

[glotov, 2010/12/21 20:33:34]

Done.

+    CHECK(!res.empty()) << "Locale could not be found for " << locale;
 
     // Enable the keyboard layouts that are necessary for the new locale.
     input_method::EnableInputMethods(
         locale, input_method::kKeyboardLayoutsOnly,
         CrosLibrary::Get()->GetKeyboardLibrary()->
             GetHardwareKeyboardLayoutName());
 
     // The following line does not seem to affect locale anyhow. Maybe in
     // future..
     g_browser_process->SetApplicationLocale(locale);
@@ skipping 38 matching lines @@
 void LanguageSwitchMenu::ExecuteCommand(int command_id) {
   const std::string locale = language_list_->GetLocaleFromIndex(command_id);
   SwitchLanguage(locale);
   InitLanguageMenu();
 
   // Update all view hierarchies that the locale has changed.
   views::Widget::NotifyLocaleChanged();
 }
 
 }  // namespace chromeos