diff options
| author | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-12 16:10:33 +0000 |
|---|---|---|
| committer | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-12 16:10:33 +0000 |
| commit | d473faf1197b5ef4682cab1747e162dd2e6f4a82 (patch) | |
| tree | e406fec3349e62c5a31dc589474225c55ef39e30 | |
| parent | 1805ab38079bcc3eb907233d313dd1c3330c824a (diff) | |
| download | chromium_src-d473faf1197b5ef4682cab1747e162dd2e6f4a82.zip chromium_src-d473faf1197b5ef4682cab1747e162dd2e6f4a82.tar.gz chromium_src-d473faf1197b5ef4682cab1747e162dd2e6f4a82.tar.bz2 | |
Merge 216533 "Fix kiosk auto launch crash after enrollment."
> Fix kiosk auto launch crash after enrollment.
>
> BUG=269644
>
> Review URL: https://chromiumcodereview.appspot.com/22554003
TBR=xiyuan@chromium.org
Review URL: https://codereview.chromium.org/22852004
git-svn-id: svn://svn.chromium.org/chrome/branches/1547/src@217005 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/chromeos/login/wizard_controller.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/chromeos/login/wizard_controller.cc b/chrome/browser/chromeos/login/wizard_controller.cc index a8adf9c..fdbadf1 100644 --- a/chrome/browser/chromeos/login/wizard_controller.cc +++ b/chrome/browser/chromeos/login/wizard_controller.cc @@ -836,7 +836,9 @@ void WizardController::AutoLaunchKioskApp() { KioskAppManager::App app_data; std::string app_id = KioskAppManager::Get()->GetAutoLaunchApp(); CHECK(KioskAppManager::Get()->GetApp(app_id, &app_data)); - ExistingUserController::current_controller()->PrepareKioskAppLaunch(); + if (ExistingUserController::current_controller()) + ExistingUserController::current_controller()->PrepareKioskAppLaunch(); + // KioskAppLauncher deletes itself when done. (new KioskAppLauncher(KioskAppManager::Get(), app_id))->Start(); } |