Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(690)

Unified Diff: chrome/browser/chromeos/login/ui/login_display_host_impl.cc

Issue 900553006: Updated KioskAppManager to track whether an app was auto-launched. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Review feedback Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 2bd0954c277d2a40cdd16b2797ae6c47dd7a14e0..7e843cc88403d2419e9ca40745ce30ea8cebd694 100644
--- a/chrome/browser/chromeos/login/ui/login_display_host_impl.cc
+++ b/chrome/browser/chromeos/login/ui/login_display_host_impl.cc
@@ -667,7 +667,8 @@ void LoginDisplayHostImpl::StartDemoAppLaunch() {
}
void LoginDisplayHostImpl::StartAppLaunch(const std::string& app_id,
- bool diagnostic_mode) {
+ bool diagnostic_mode,
+ bool auto_launch) {
VLOG(1) << "Login WebUI >> start app launch.";
SetStatusAreaVisible(false);
@@ -678,7 +679,8 @@ void LoginDisplayHostImpl::StartAppLaunch(const std::string& app_id,
&LoginDisplayHostImpl::StartAppLaunch,
pointer_factory_.GetWeakPtr(),
app_id,
- diagnostic_mode));
+ diagnostic_mode,
+ auto_launch));
if (status == CrosSettingsProvider::TEMPORARILY_UNTRUSTED)
return;
@@ -708,7 +710,7 @@ void LoginDisplayHostImpl::StartAppLaunch(const std::string& app_id,
app_launch_controller_.reset(new AppLaunchController(
app_id, diagnostic_mode, this, GetOobeUI()));
- app_launch_controller_->StartAppLaunch();
+ app_launch_controller_->StartAppLaunch(auto_launch);
}
////////////////////////////////////////////////////////////////////////////////
@@ -1189,8 +1191,11 @@ void ShowLoginWizard(const std::string& first_screen_name) {
if (show_app_launch_splash_screen) {
const std::string& auto_launch_app_id =
KioskAppManager::Get()->GetAutoLaunchApp();
+ const bool diagnostic_mode = false;
+ const bool auto_launch = true;
display_host->StartAppLaunch(auto_launch_app_id,
- false /* diagnostic_mode */);
+ diagnostic_mode,
+ auto_launch);
return;
}
« no previous file with comments | « chrome/browser/chromeos/login/ui/login_display_host_impl.h ('k') | chrome/browser/chromeos/login/ui/mock_login_display_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698