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/wizard_controller.h" | 5 #include "chrome/browser/chromeos/login/wizard_controller.h" |
6 | 6 |
7 #include <signal.h> | 7 #include <signal.h> |
8 #include <stdlib.h> | 8 #include <stdlib.h> |
9 #include <sys/types.h> | 9 #include <sys/types.h> |
10 | 10 |
(...skipping 1093 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1104 | 1104 |
1105 bool device_disabled = false; | 1105 bool device_disabled = false; |
1106 CrosSettings::Get()->GetBoolean(kDeviceDisabled, &device_disabled); | 1106 CrosSettings::Get()->GetBoolean(kDeviceDisabled, &device_disabled); |
1107 if (device_disabled && system::DeviceDisablingManager:: | 1107 if (device_disabled && system::DeviceDisablingManager:: |
1108 HonorDeviceDisablingDuringNormalOperation()) { | 1108 HonorDeviceDisablingDuringNormalOperation()) { |
1109 // If the device is disabled, bail out. A device disabled screen will be | 1109 // If the device is disabled, bail out. A device disabled screen will be |
1110 // shown by the DeviceDisablingManager. | 1110 // shown by the DeviceDisablingManager. |
1111 return; | 1111 return; |
1112 } | 1112 } |
1113 | 1113 |
1114 host_->StartAppLaunch(app_id, false /* diagnostic_mode */); | 1114 host_->StartAppLaunch(app_id, |
1115 false /* diagnostic_mode */, | |
1116 true /* auto_launch */); | |
Dmitry Polukhin
2015/02/06 13:41:32
ditto
Andrew T Wilson (Slow)
2015/02/06 20:43:50
Done.
| |
1115 } | 1117 } |
1116 | 1118 |
1117 // static | 1119 // static |
1118 void WizardController::SetZeroDelays() { | 1120 void WizardController::SetZeroDelays() { |
1119 kShowDelayMs = 0; | 1121 kShowDelayMs = 0; |
1120 zero_delay_enabled_ = true; | 1122 zero_delay_enabled_ = true; |
1121 } | 1123 } |
1122 | 1124 |
1123 // static | 1125 // static |
1124 bool WizardController::IsZeroDelayEnabled() { | 1126 bool WizardController::IsZeroDelayEnabled() { |
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1291 } | 1293 } |
1292 | 1294 |
1293 EnrollmentScreen* screen = EnrollmentScreen::Get(this); | 1295 EnrollmentScreen* screen = EnrollmentScreen::Get(this); |
1294 screen->SetParameters(effective_config, shark_controller_.get(), | 1296 screen->SetParameters(effective_config, shark_controller_.get(), |
1295 remora_controller_.get()); | 1297 remora_controller_.get()); |
1296 SetStatusAreaVisible(true); | 1298 SetStatusAreaVisible(true); |
1297 SetCurrentScreen(screen); | 1299 SetCurrentScreen(screen); |
1298 } | 1300 } |
1299 | 1301 |
1300 } // namespace chromeos | 1302 } // namespace chromeos |
OLD | NEW |