Chromium Code Reviews| Index: chrome/browser/chromeos/login/ui/login_display_host_impl.cc |
| diff --git a/chrome/browser/chromeos/login/ui/login_display_host_impl.cc b/chrome/browser/chromeos/login/ui/login_display_host_impl.cc |
| index d14718a07fa62b1e359f2e849d93c037af3049e2..edd6a7c47ffc2408498c974e0687522329072557 100644 |
| --- a/chrome/browser/chromeos/login/ui/login_display_host_impl.cc |
| +++ b/chrome/browser/chromeos/login/ui/login_display_host_impl.cc |
| @@ -35,6 +35,7 @@ |
| #include "chrome/browser/chromeos/first_run/first_run.h" |
| #include "chrome/browser/chromeos/input_method/input_method_util.h" |
| #include "chrome/browser/chromeos/language_preferences.h" |
| +#include "chrome/browser/chromeos/login/arc_kiosk_controller.h" |
| #include "chrome/browser/chromeos/login/demo_mode/demo_app_launcher.h" |
| #include "chrome/browser/chromeos/login/enrollment/auto_enrollment_controller.h" |
| #include "chrome/browser/chromeos/login/existing_user_controller.h" |
| @@ -80,6 +81,7 @@ |
| #include "chromeos/timezone/timezone_resolver.h" |
| #include "components/prefs/pref_service.h" |
| #include "components/session_manager/core/session_manager.h" |
| +#include "components/signin/core/account_id/account_id.h" |
| #include "components/user_manager/user.h" |
| #include "components/user_manager/user_manager.h" |
| #include "content/public/browser/notification_service.h" |
| @@ -126,6 +128,9 @@ const char kUserAddingURL[] = "chrome://oobe/user-adding"; |
| // URL which corresponds to the app launch splash WebUI. |
| const char kAppLaunchSplashURL[] = "chrome://oobe/app-launch-splash"; |
| +// URL which corresponds to the ARC kiosk splash WebUI. |
| +const char kArcKioskSplashURL[] = "chrome://oobe/arc-kiosk-splash"; |
| + |
| // Duration of sign-in transition animation. |
| const int kLoginFadeoutTransitionDurationMs = 700; |
| @@ -784,6 +789,25 @@ void LoginDisplayHostImpl::StartAppLaunch(const std::string& app_id, |
| app_launch_controller_->StartAppLaunch(auto_launch); |
| } |
| +void LoginDisplayHostImpl::StartArcKiosk(const AccountId& account_id) { |
| + VLOG(1) << "Login WebUI >> start ARC kiosk."; |
| + SetStatusAreaVisible(false); |
| + |
| + // Animation is not supported in Mash. |
| + if (!chrome::IsRunningInMash()) |
| + finalize_animation_type_ = ANIMATION_FADE_OUT; |
| + if (!login_window_) { |
| + LoadURL(GURL(kAppLaunchSplashURL)); |
| + LoadURL(GURL(kArcKioskSplashURL)); |
| + } |
| + |
| + login_view_->set_should_emit_login_prompt_visible(false); |
| + |
| + arc_kiosk_controller_.reset(new ArcKioskController(this, GetOobeUI())); |
|
Luis Héctor Chávez
2017/01/26 17:37:45
nit: = base::MakeUnique<ArcKioskController>(...);
Sergey Poromov
2017/01/26 18:30:22
Done.
|
| + |
| + arc_kiosk_controller_->StartArcKiosk(account_id); |
| +} |
| + |
| //////////////////////////////////////////////////////////////////////////////// |
| // LoginDisplayHostImpl, public |