Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/chromeos/login/login_display_host_impl.h" | 5 #include "chrome/browser/chromeos/login/login_display_host_impl.h" |
| 6 | 6 |
| 7 #include <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "ash/audio/sounds.h" | 9 #include "ash/audio/sounds.h" |
| 10 #include "ash/desktop_background/desktop_background_controller.h" | 10 #include "ash/desktop_background/desktop_background_controller.h" |
| (...skipping 30 matching lines...) Expand all Loading... | |
| 41 #include "chrome/browser/chromeos/login/keyboard_driven_oobe_key_handler.h" | 41 #include "chrome/browser/chromeos/login/keyboard_driven_oobe_key_handler.h" |
| 42 #include "chrome/browser/chromeos/login/login_utils.h" | 42 #include "chrome/browser/chromeos/login/login_utils.h" |
| 43 #include "chrome/browser/chromeos/login/login_wizard.h" | 43 #include "chrome/browser/chromeos/login/login_wizard.h" |
| 44 #include "chrome/browser/chromeos/login/oobe_display.h" | 44 #include "chrome/browser/chromeos/login/oobe_display.h" |
| 45 #include "chrome/browser/chromeos/login/startup_utils.h" | 45 #include "chrome/browser/chromeos/login/startup_utils.h" |
| 46 #include "chrome/browser/chromeos/login/user_manager.h" | 46 #include "chrome/browser/chromeos/login/user_manager.h" |
| 47 #include "chrome/browser/chromeos/login/webui_login_display.h" | 47 #include "chrome/browser/chromeos/login/webui_login_display.h" |
| 48 #include "chrome/browser/chromeos/login/webui_login_view.h" | 48 #include "chrome/browser/chromeos/login/webui_login_view.h" |
| 49 #include "chrome/browser/chromeos/login/wizard_controller.h" | 49 #include "chrome/browser/chromeos/login/wizard_controller.h" |
| 50 #include "chrome/browser/chromeos/mobile_config.h" | 50 #include "chrome/browser/chromeos/mobile_config.h" |
| 51 #include "chrome/browser/chromeos/net/delay_network_call.h" | |
| 51 #include "chrome/browser/chromeos/policy/auto_enrollment_client.h" | 52 #include "chrome/browser/chromeos/policy/auto_enrollment_client.h" |
| 52 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" | 53 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" |
| 53 #include "chrome/browser/chromeos/system/input_device_settings.h" | 54 #include "chrome/browser/chromeos/system/input_device_settings.h" |
| 54 #include "chrome/browser/chromeos/ui/focus_ring_controller.h" | 55 #include "chrome/browser/chromeos/ui/focus_ring_controller.h" |
| 55 #include "chrome/browser/lifetime/application_lifetime.h" | 56 #include "chrome/browser/lifetime/application_lifetime.h" |
| 56 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h" | 57 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h" |
| 57 #include "chrome/common/chrome_constants.h" | 58 #include "chrome/common/chrome_constants.h" |
| 58 #include "chrome/common/chrome_switches.h" | 59 #include "chrome/common/chrome_switches.h" |
| 59 #include "chrome/common/pref_names.h" | 60 #include "chrome/common/pref_names.h" |
| 60 #include "chromeos/audio/chromeos_sounds.h" | 61 #include "chromeos/audio/chromeos_sounds.h" |
| (...skipping 1142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1203 locale, | 1204 locale, |
| 1204 manager->GetInputMethodUtil()->GetHardwareInputMethodIds()); | 1205 manager->GetInputMethodUtil()->GetHardwareInputMethodIds()); |
| 1205 base::ThreadRestrictions::ScopedAllowIO allow_io; | 1206 base::ThreadRestrictions::ScopedAllowIO allow_io; |
| 1206 const std::string loaded_locale = | 1207 const std::string loaded_locale = |
| 1207 ResourceBundle::GetSharedInstance().ReloadLocaleResources(locale); | 1208 ResourceBundle::GetSharedInstance().ReloadLocaleResources(locale); |
| 1208 g_browser_process->SetApplicationLocale(loaded_locale); | 1209 g_browser_process->SetApplicationLocale(loaded_locale); |
| 1209 } | 1210 } |
| 1210 display_host->StartSignInScreen(LoginScreenContext()); | 1211 display_host->StartSignInScreen(LoginScreenContext()); |
| 1211 return; | 1212 return; |
| 1212 } | 1213 } |
| 1214 if (StartupUtils::IsEulaAccepted()) | |
|
Nikita (slow)
2014/04/17 05:23:34
Just FYI, this call will only be called in one cas
Alexander Alekseev
2014/04/17 14:34:39
Thank you.
I should move this call before if (sho
| |
| 1215 DelayNetworkCall( | |
| 1216 ServicesCustomizationDocument::GetInstance() | |
| 1217 ->EnsureCustomizationAppliedClosure(), | |
| 1218 base::TimeDelta::FromMilliseconds(kDefaultNetworkRetryDelayMS)); | |
| 1213 | 1219 |
| 1214 // Load startup manifest. | 1220 // Load startup manifest. |
| 1215 const chromeos::StartupCustomizationDocument* startup_manifest = | 1221 const chromeos::StartupCustomizationDocument* startup_manifest = |
| 1216 chromeos::StartupCustomizationDocument::GetInstance(); | 1222 chromeos::StartupCustomizationDocument::GetInstance(); |
| 1217 | 1223 |
| 1218 // Switch to initial locale if specified by customization | 1224 // Switch to initial locale if specified by customization |
| 1219 // and has not been set yet. We cannot call | 1225 // and has not been set yet. We cannot call |
| 1220 // chromeos::LanguageSwitchMenu::SwitchLanguage here before | 1226 // chromeos::LanguageSwitchMenu::SwitchLanguage here before |
| 1221 // EmitLoginPromptReady. | 1227 // EmitLoginPromptReady. |
| 1222 PrefService* prefs = g_browser_process->local_state(); | 1228 PrefService* prefs = g_browser_process->local_state(); |
| (...skipping 28 matching lines...) Expand all Loading... | |
| 1251 scoped_ptr<locale_util::SwitchLanguageCallback> callback( | 1257 scoped_ptr<locale_util::SwitchLanguageCallback> callback( |
| 1252 new locale_util::SwitchLanguageCallback( | 1258 new locale_util::SwitchLanguageCallback( |
| 1253 base::Bind(&OnLanguageSwitchedCallback, base::Passed(data.Pass())))); | 1259 base::Bind(&OnLanguageSwitchedCallback, base::Passed(data.Pass())))); |
| 1254 | 1260 |
| 1255 // Load locale keyboards here. Hardware layout would be automatically enabled. | 1261 // Load locale keyboards here. Hardware layout would be automatically enabled. |
| 1256 locale_util::SwitchLanguage( | 1262 locale_util::SwitchLanguage( |
| 1257 locale, true, true /* login_layouts_only */, callback.Pass()); | 1263 locale, true, true /* login_layouts_only */, callback.Pass()); |
| 1258 } | 1264 } |
| 1259 | 1265 |
| 1260 } // namespace chromeos | 1266 } // namespace chromeos |
| OLD | NEW |