Index: chrome/browser/chromeos/login/ui/login_display_host_impl.cc |
diff --git a/chrome/browser/chromeos/login/login_display_host_impl.cc b/chrome/browser/chromeos/login/ui/login_display_host_impl.cc |
similarity index 97% |
rename from chrome/browser/chromeos/login/login_display_host_impl.cc |
rename to chrome/browser/chromeos/login/ui/login_display_host_impl.cc |
index 772188d55a09f328c79eb0c9fb6491260bd77ea1..a36ad5832f9898cf316bd6656e3c5f3c52c67aab 100644 |
--- a/chrome/browser/chromeos/login/login_display_host_impl.cc |
+++ b/chrome/browser/chromeos/login/ui/login_display_host_impl.cc |
@@ -2,7 +2,7 @@ |
// 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/login_display_host_impl.h" |
+#include "chrome/browser/chromeos/login/ui/login_display_host_impl.h" |
#include <vector> |
@@ -37,15 +37,15 @@ |
#include "chrome/browser/chromeos/login/demo_mode/demo_app_launcher.h" |
#include "chrome/browser/chromeos/login/existing_user_controller.h" |
#include "chrome/browser/chromeos/login/helper.h" |
-#include "chrome/browser/chromeos/login/input_events_blocker.h" |
-#include "chrome/browser/chromeos/login/keyboard_driven_oobe_key_handler.h" |
#include "chrome/browser/chromeos/login/login_utils.h" |
#include "chrome/browser/chromeos/login/login_wizard.h" |
-#include "chrome/browser/chromeos/login/oobe_display.h" |
#include "chrome/browser/chromeos/login/startup_utils.h" |
-#include "chrome/browser/chromeos/login/user_manager.h" |
-#include "chrome/browser/chromeos/login/webui_login_display.h" |
-#include "chrome/browser/chromeos/login/webui_login_view.h" |
+#include "chrome/browser/chromeos/login/ui/input_events_blocker.h" |
+#include "chrome/browser/chromeos/login/ui/keyboard_driven_oobe_key_handler.h" |
+#include "chrome/browser/chromeos/login/ui/oobe_display.h" |
+#include "chrome/browser/chromeos/login/ui/webui_login_display.h" |
+#include "chrome/browser/chromeos/login/ui/webui_login_view.h" |
+#include "chrome/browser/chromeos/login/users/user_manager.h" |
#include "chrome/browser/chromeos/login/wizard_controller.h" |
#include "chrome/browser/chromeos/mobile_config.h" |
#include "chrome/browser/chromeos/net/delay_network_call.h" |
@@ -1198,22 +1198,6 @@ void ShowLoginWizard(const std::string& first_screen_name) { |
first_screen_name == chromeos::WizardController::kLoginScreenName; |
if (show_login_screen) { |
- // R11 > R12 migration fix. See http://crosbug.com/p/4898. |
- // If user has manually changed locale during R11 OOBE, locale will be set. |
- // On R12 > R12|R13 etc. this fix won't get activated since |
- // OOBE process has set kApplicationLocale to non-default value. |
- PrefService* prefs = g_browser_process->local_state(); |
- if (!prefs->HasPrefPath(prefs::kApplicationLocale)) { |
- std::string locale = chromeos::StartupUtils::GetInitialLocale(); |
- prefs->SetString(prefs::kApplicationLocale, locale); |
- manager->EnableLoginLayouts( |
- locale, |
- manager->GetInputMethodUtil()->GetHardwareInputMethodIds()); |
- base::ThreadRestrictions::ScopedAllowIO allow_io; |
- const std::string loaded_locale = |
- ResourceBundle::GetSharedInstance().ReloadLocaleResources(locale); |
- g_browser_process->SetApplicationLocale(loaded_locale); |
- } |
display_host->StartSignInScreen(LoginScreenContext()); |
return; |
} |