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);
+  if (index == -1) {
+    // If locale cannot be found (probably user edited prefs file

[Nikita (slow), 2010/12/16 15:28:49]

I'm not sure that in the original crash users were able to actually edit prefs
file manually.

Would be helpful to understand why it's caused. This could be a bug here and
we're hiding it now.

+    // manually) - use the default.
+    index = 0;

[Nikita (slow), 2010/12/16 15:28:49]

Default locale (0) is always en-US?

+  }
+  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);
@@ skipping 63 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