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 537 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
548 PerformPostUpdateActions(); | 548 PerformPostUpdateActions(); |
549 | 549 |
550 // TODO(mnissler): Unify the logic for auto-login for Public Sessions and | 550 // TODO(mnissler): Unify the logic for auto-login for Public Sessions and |
551 // Kiosk Apps and make this code cover both cases: http://crbug.com/234694. | 551 // Kiosk Apps and make this code cover both cases: http://crbug.com/234694. |
552 const std::string auto_launch_app = | 552 const std::string auto_launch_app = |
553 KioskAppManager::Get()->GetAutoLaunchApp(); | 553 KioskAppManager::Get()->GetAutoLaunchApp(); |
554 if (!auto_launch_app.empty()) { | 554 if (!auto_launch_app.empty()) { |
555 ExistingUserController::current_controller()->PrepareKioskAppLaunch(); | 555 ExistingUserController::current_controller()->PrepareKioskAppLaunch(); |
556 | 556 |
557 // KioskAppLauncher deletes itself when done. | 557 // KioskAppLauncher deletes itself when done. |
558 (new KioskAppLauncher(auto_launch_app))->Start(); | 558 (new KioskAppLauncher(KioskAppManager::Get(), auto_launch_app))->Start(); |
559 } else if (!force_enrollment_ || can_exit_enrollment_) { | 559 } else if (!force_enrollment_ || can_exit_enrollment_) { |
560 ShowLoginScreen(); | 560 ShowLoginScreen(); |
561 } | 561 } |
562 } | 562 } |
563 | 563 |
564 void WizardController::OnResetCanceled() { | 564 void WizardController::OnResetCanceled() { |
565 if (previous_screen_) | 565 if (previous_screen_) |
566 SetCurrentScreen(previous_screen_); | 566 SetCurrentScreen(previous_screen_); |
567 else | 567 else |
568 ShowLoginScreen(); | 568 ShowLoginScreen(); |
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
797 return zero_delay_enabled_; | 797 return zero_delay_enabled_; |
798 } | 798 } |
799 | 799 |
800 // static | 800 // static |
801 void WizardController::SetZeroDelays() { | 801 void WizardController::SetZeroDelays() { |
802 kShowDelayMs = 0; | 802 kShowDelayMs = 0; |
803 zero_delay_enabled_ = true; | 803 zero_delay_enabled_ = true; |
804 } | 804 } |
805 | 805 |
806 } // namespace chromeos | 806 } // namespace chromeos |
OLD | NEW |