| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/ui/login_display_host_impl.h" | 5 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "ash/common/system/tray/system_tray.h" | 10 #include "ash/common/system/tray/system_tray.h" |
| (...skipping 851 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 862 LoadURL(GURL(kAppLaunchSplashURL)); | 862 LoadURL(GURL(kAppLaunchSplashURL)); |
| 863 | 863 |
| 864 login_view_->set_should_emit_login_prompt_visible(false); | 864 login_view_->set_should_emit_login_prompt_visible(false); |
| 865 | 865 |
| 866 app_launch_controller_.reset(new AppLaunchController( | 866 app_launch_controller_.reset(new AppLaunchController( |
| 867 app_id, diagnostic_mode, this, GetOobeUI())); | 867 app_id, diagnostic_mode, this, GetOobeUI())); |
| 868 | 868 |
| 869 app_launch_controller_->StartAppLaunch(auto_launch); | 869 app_launch_controller_->StartAppLaunch(auto_launch); |
| 870 } | 870 } |
| 871 | 871 |
| 872 void LoginDisplayHostImpl::StartArcKiosk(const AccountId& account_id) { | 872 void LoginDisplayHostImpl::StartArcKiosk(const AccountId& account_id, |
| 873 bool is_auto_launch) { |
| 873 VLOG(1) << "Login WebUI >> start ARC kiosk."; | 874 VLOG(1) << "Login WebUI >> start ARC kiosk."; |
| 874 SetStatusAreaVisible(false); | 875 SetStatusAreaVisible(false); |
| 875 | 876 |
| 876 // Animation is not supported in Mash. | 877 // Animation is not supported in Mash. |
| 877 if (!ash_util::IsRunningInMash()) | 878 if (!ash_util::IsRunningInMash()) |
| 878 finalize_animation_type_ = ANIMATION_FADE_OUT; | 879 finalize_animation_type_ = ANIMATION_FADE_OUT; |
| 879 if (!login_window_) { | 880 if (!login_window_) { |
| 880 LoadURL(GURL(kAppLaunchSplashURL)); | 881 LoadURL(GURL(kAppLaunchSplashURL)); |
| 881 LoadURL(GURL(kArcKioskSplashURL)); | 882 LoadURL(GURL(kArcKioskSplashURL)); |
| 882 } | 883 } |
| 883 | 884 |
| 884 login_view_->set_should_emit_login_prompt_visible(false); | 885 login_view_->set_should_emit_login_prompt_visible(false); |
| 885 | 886 |
| 886 arc_kiosk_controller_ = | 887 arc_kiosk_controller_ = |
| 887 base::MakeUnique<ArcKioskController>(this, GetOobeUI()); | 888 base::MakeUnique<ArcKioskController>(this, GetOobeUI()); |
| 888 | 889 |
| 889 arc_kiosk_controller_->StartArcKiosk(account_id); | 890 arc_kiosk_controller_->StartArcKiosk(account_id, is_auto_launch); |
| 890 } | 891 } |
| 891 | 892 |
| 892 //////////////////////////////////////////////////////////////////////////////// | 893 //////////////////////////////////////////////////////////////////////////////// |
| 893 // LoginDisplayHostImpl, public | 894 // LoginDisplayHostImpl, public |
| 894 | 895 |
| 895 WizardController* LoginDisplayHostImpl::CreateWizardController() { | 896 WizardController* LoginDisplayHostImpl::CreateWizardController() { |
| 896 // TODO(altimofeev): ensure that WebUI is ready. | 897 // TODO(altimofeev): ensure that WebUI is ready. |
| 897 OobeUI* oobe_ui = GetOobeUI(); | 898 OobeUI* oobe_ui = GetOobeUI(); |
| 898 return new WizardController(this, oobe_ui); | 899 return new WizardController(this, oobe_ui); |
| 899 } | 900 } |
| (...skipping 588 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1488 // Chrome locale. Otherwise it will be lost if Chrome restarts. | 1489 // Chrome locale. Otherwise it will be lost if Chrome restarts. |
| 1489 // Don't need to schedule pref save because setting initial local | 1490 // Don't need to schedule pref save because setting initial local |
| 1490 // will enforce preference saving. | 1491 // will enforce preference saving. |
| 1491 prefs->SetString(prefs::kApplicationLocale, locale); | 1492 prefs->SetString(prefs::kApplicationLocale, locale); |
| 1492 StartupUtils::SetInitialLocale(locale); | 1493 StartupUtils::SetInitialLocale(locale); |
| 1493 | 1494 |
| 1494 TriggerShowLoginWizardFinish(locale, std::move(data)); | 1495 TriggerShowLoginWizardFinish(locale, std::move(data)); |
| 1495 } | 1496 } |
| 1496 | 1497 |
| 1497 } // namespace chromeos | 1498 } // namespace chromeos |
| OLD | NEW |