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

chrome/browser/chromeos/login/wizard_controller.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/wizard_controller.h"
 
 #include <gdk/gdk.h>
 #include <signal.h>
 #include <sys/types.h>
 
 #include <string>
 #include <vector>
 
 #include "app/l10n_util.h"
 #include "base/command_line.h"
 #include "base/logging.h"  // For NOTREACHED.
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/login_library.h"
 #include "chrome/browser/chromeos/customization_document.h"
 #include "chrome/browser/chromeos/login/account_screen.h"
 #include "chrome/browser/chromeos/login/background_view.h"
 #include "chrome/browser/chromeos/login/existing_user_controller.h"
+#include "chrome/browser/chromeos/login/language_switch_model.h"
 #include "chrome/browser/chromeos/login/login_screen.h"
 #include "chrome/browser/chromeos/login/login_utils.h"
 #include "chrome/browser/chromeos/login/network_screen.h"
 #include "chrome/browser/chromeos/login/rounded_rect_painter.h"
 #include "chrome/browser/chromeos/login/update_screen.h"
 #include "chrome/browser/chromeos/login/user_image_screen.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/wm_ipc.h"
 #include "chrome/browser/profile_manager.h"
 #include "chrome/common/chrome_switches.h"
@@ skipping 207 matching lines @@
       window->GetNativeView(),
       chromeos::WM_IPC_WINDOW_LOGIN_GUEST,
       NULL);
   window->SetContentsView(contents_);
 
   if (chromeos::UserManager::Get()->GetUsers().empty() ||
       first_screen_name == kOutOfBoxScreenName) {
     is_out_of_box_ = true;
   }
 
+  // Switch to initial locale if specified by customization.
+  if (customization_ != NULL) {
+    std::string locale = customization_->initial_locale();
+    if (!locale.empty()) {
+      chromeos::LanguageSwitchModel::SwitchLanguage(locale);
+    }
+  }
+
   ShowFirstScreen(first_screen_name);
 
   // This keeps the window from flashing at startup.
   GdkWindow* gdk_window = window->GetNativeView()->window;
   gdk_window_set_back_pixmap(gdk_window, NULL, false);
 }
 
 void WizardController::Show() {
   DCHECK(widget_);
   widget_->Show();
@@ skipping 325 matching lines @@
   WizardController* controller = new WizardController();
   controller->SetCustomization(customization.release());
   controller->ShowBackground(screen_bounds);
   controller->Init(first_screen_name, screen_bounds, true);
   controller->Show();
   if (chromeos::CrosLibrary::Get()->EnsureLoaded())
     chromeos::CrosLibrary::Get()->GetLoginLibrary()->EmitLoginPromptReady();
 }
 
 }  // namespace browser