Added setting the locale on startup to the initial_locale attribute in...

chrome/browser/chromeos/login/language_switch_model.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_model.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 63 matching lines @@
   GtkRequisition box_size;
   gtk_widget_size_request(menu_->GetNativeMenu(), &box_size);
   return box_size.width;
 }
 
 void LanguageSwitchModel::SetFirstLevelMenuWidth(int width) {
   DCHECK(menu_ != NULL);
   gtk_widget_set_size_request(menu_->GetNativeMenu(), width, -1);
 }
 
+// static
+void LanguageSwitchModel::SwitchLanguage(const std::string& locale) {
+  // Save new locale.
+  DCHECK(g_browser_process);
+  PrefService* prefs = g_browser_process->local_state();
+  prefs->SetString(prefs::kApplicationLocale, UTF8ToWide(locale));
+  prefs->SavePersistentPrefs();
+
+  // Switch the locale.
+  ResourceBundle::ReloadSharedInstance(UTF8ToWide(locale));
+
+  // The following line does not seem to affect locale anyhow. Maybe in future..
+  g_browser_process->SetApplicationLocale(locale);
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // views::ViewMenuDelegate implementation.
 
 void LanguageSwitchModel::RunMenu(views::View* source, const gfx::Point& pt) {
   DCHECK(menu_ != NULL);
   gfx::Point point(pt);
   point.Offset(delta_x_, delta_y_);
   menu_->RunMenuAt(point, views::Menu2::ALIGN_TOPRIGHT);
 }
 
@@ skipping 15 matching lines @@
 
 void LanguageSwitchModel::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();
 }
 
-////////////////////////////////////////////////////////////////////////////////
-// Private implementation.
-
-// static
-void LanguageSwitchModel::SwitchLanguage(const std::string& locale) {
-  // Save new locale.
-  DCHECK(g_browser_process);
-  PrefService* prefs = g_browser_process->local_state();
-  prefs->SetString(prefs::kApplicationLocale, UTF8ToWide(locale));
-  prefs->SavePersistentPrefs();
-
-  // Switch the locale.
-  ResourceBundle::ReloadSharedInstance(UTF8ToWide(locale));
-
-  // The following line does not seem to affect locale anyhow. Maybe in future..
-  g_browser_process->SetApplicationLocale(locale);
-}
-
 }  // namespace chromeos