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/desktop_background/desktop_background_controller.h" | 9 #include "ash/desktop_background/desktop_background_controller.h" |
10 #include "ash/desktop_background/user_wallpaper_delegate.h" | 10 #include "ash/desktop_background/user_wallpaper_delegate.h" |
(...skipping 1101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1112 chromeos::KioskAppManager::Get()->GetAutoLaunchApp(); | 1112 chromeos::KioskAppManager::Get()->GetAutoLaunchApp(); |
1113 display_host->StartAppLaunch(auto_launch_app_id); | 1113 display_host->StartAppLaunch(auto_launch_app_id); |
1114 return; | 1114 return; |
1115 } | 1115 } |
1116 | 1116 |
1117 bool should_show_enrollment_screen = | 1117 bool should_show_enrollment_screen = |
1118 first_screen_name.empty() && oobe_complete && | 1118 first_screen_name.empty() && oobe_complete && |
1119 chromeos::WizardController::ShouldAutoStartEnrollment() && | 1119 chromeos::WizardController::ShouldAutoStartEnrollment() && |
1120 !g_browser_process->browser_policy_connector()->IsEnterpriseManaged(); | 1120 !g_browser_process->browser_policy_connector()->IsEnterpriseManaged(); |
1121 if (should_show_enrollment_screen) { | 1121 if (should_show_enrollment_screen) { |
1122 display_host->StartWizard(chromeos::WizardController::kEnrollmentScreenName, | 1122 // Shows networks screen instead of enrollment screen to resume the |
| 1123 // interrupted auto start enrollment flow because enrollment screen does |
| 1124 // not handle flaky network. See http://crbug.com/332572 |
| 1125 display_host->StartWizard(chromeos::WizardController::kNetworkScreenName, |
1123 scoped_ptr<base::DictionaryValue>()); | 1126 scoped_ptr<base::DictionaryValue>()); |
1124 return; | 1127 return; |
1125 } | 1128 } |
1126 | 1129 |
1127 bool show_login_screen = | 1130 bool show_login_screen = |
1128 (first_screen_name.empty() && oobe_complete) || | 1131 (first_screen_name.empty() && oobe_complete) || |
1129 first_screen_name == chromeos::WizardController::kLoginScreenName; | 1132 first_screen_name == chromeos::WizardController::kLoginScreenName; |
1130 | 1133 |
1131 if (show_login_screen) { | 1134 if (show_login_screen) { |
1132 // R11 > R12 migration fix. See http://crosbug.com/p/4898. | 1135 // R11 > R12 migration fix. See http://crosbug.com/p/4898. |
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1192 | 1195 |
1193 scoped_ptr<locale_util::SwitchLanguageCallback> callback( | 1196 scoped_ptr<locale_util::SwitchLanguageCallback> callback( |
1194 new locale_util::SwitchLanguageCallback( | 1197 new locale_util::SwitchLanguageCallback( |
1195 base::Bind(&OnLanguageSwitchedCallback, base::Passed(data.Pass())))); | 1198 base::Bind(&OnLanguageSwitchedCallback, base::Passed(data.Pass())))); |
1196 | 1199 |
1197 // Do not load locale keyboards here. | 1200 // Do not load locale keyboards here. |
1198 locale_util::SwitchLanguage(locale, false, callback.Pass()); | 1201 locale_util::SwitchLanguage(locale, false, callback.Pass()); |
1199 } | 1202 } |
1200 | 1203 |
1201 } // namespace chromeos | 1204 } // namespace chromeos |
OLD | NEW |