| Index: chrome/browser/chromeos/app_mode/kiosk_profile_loader.cc
|
| diff --git a/chrome/browser/chromeos/app_mode/kiosk_profile_loader.cc b/chrome/browser/chromeos/app_mode/kiosk_profile_loader.cc
|
| index 689ab68afcef431fdfd1db2907dc84dc1208563d..2bfe2e275b9d329f48b6e0f718275e2445d8e2b8 100644
|
| --- a/chrome/browser/chromeos/app_mode/kiosk_profile_loader.cc
|
| +++ b/chrome/browser/chromeos/app_mode/kiosk_profile_loader.cc
|
| @@ -12,7 +12,6 @@
|
| #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"
|
| #include "chrome/browser/chromeos/login/auth/chrome_login_performer.h"
|
| #include "chrome/browser/chromeos/login/demo_mode/demo_app_launcher.h"
|
| -#include "chrome/browser/chromeos/login/login_utils.h"
|
| #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"
|
| #include "chrome/browser/chromeos/settings/cros_settings.h"
|
| #include "chrome/browser/lifetime/application_lifetime.h"
|
| @@ -160,10 +159,11 @@ void KioskProfileLoader::OnAuthSuccess(const UserContext& user_context) {
|
| UserContext context = user_context;
|
| if (context.GetUserID() == chromeos::login::kGuestUserName)
|
| context.SetUserID(DemoAppLauncher::kDemoUserName);
|
| - LoginUtils::Get()->PrepareProfile(context,
|
| - false, // has_auth_cookies
|
| - false, // has_active_session
|
| - this);
|
| + UserSessionManager::GetInstance()->StartSession(
|
| + context, UserSessionManager::PRIMARY_USER_SESSION,
|
| + false, // has_auth_cookies
|
| + false, // Start session for user.
|
| + this);
|
| }
|
|
|
| void KioskProfileLoader::OnAuthFailure(const AuthFailure& error) {
|
| @@ -186,8 +186,8 @@ void KioskProfileLoader::OnOnlineChecked(
|
| void KioskProfileLoader::OnProfilePrepared(Profile* profile,
|
| bool browser_launched) {
|
| // This object could be deleted any time after successfully reporting
|
| - // a profile load, so invalidate the LoginUtils delegate now.
|
| - LoginUtils::Get()->DelegateDeleted(this);
|
| + // a profile load, so invalidate the delegate now.
|
| + UserSessionManager::GetInstance()->DelegateDeleted(this);
|
|
|
| delegate_->OnProfileLoaded(profile);
|
| ReportLaunchResult(KioskAppLaunchError::NONE);
|
|
|