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

Side by Side Diff: chrome/browser/chromeos/login/existing_user_controller.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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/existing_user_controller.h" 5 #include "chrome/browser/chromeos/login/existing_user_controller.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
(...skipping 908 matching lines...) Expand 10 before | Expand all | Expand 10 after
919 return; 919 return;
920 } 920 }
921 921
922 // The user chose a locale and a suitable keyboard layout or left both unset. 922 // The user chose a locale and a suitable keyboard layout or left both unset.
923 // Login can continue immediately. 923 // Login can continue immediately.
924 LoginAsPublicSessionInternal(new_user_context); 924 LoginAsPublicSessionInternal(new_user_context);
925 } 925 }
926 926
927 void ExistingUserController::LoginAsKioskApp(const std::string& app_id, 927 void ExistingUserController::LoginAsKioskApp(const std::string& app_id,
928 bool diagnostic_mode) { 928 bool diagnostic_mode) {
929 host_->StartAppLaunch(app_id, diagnostic_mode); 929 const bool auto_start = false;
930 host_->StartAppLaunch(app_id, diagnostic_mode, auto_start);
930 } 931 }
931 932
932 void ExistingUserController::ConfigurePublicSessionAutoLogin() { 933 void ExistingUserController::ConfigurePublicSessionAutoLogin() {
933 std::string auto_login_account_id; 934 std::string auto_login_account_id;
934 cros_settings_->GetString(kAccountsPrefDeviceLocalAccountAutoLoginId, 935 cros_settings_->GetString(kAccountsPrefDeviceLocalAccountAutoLoginId,
935 &auto_login_account_id); 936 &auto_login_account_id);
936 const std::vector<policy::DeviceLocalAccount> device_local_accounts = 937 const std::vector<policy::DeviceLocalAccount> device_local_accounts =
937 policy::GetDeviceLocalAccounts(cros_settings_); 938 policy::GetDeviceLocalAccounts(cros_settings_);
938 939
939 public_session_auto_login_username_.clear(); 940 public_session_auto_login_username_.clear();
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
1125 is_login_in_progress_ = false; 1126 is_login_in_progress_ = false;
1126 1127
1127 // Reenable clicking on other windows and status area. 1128 // Reenable clicking on other windows and status area.
1128 login_display_->SetUIEnabled(true); 1129 login_display_->SetUIEnabled(true);
1129 1130
1130 if (start_public_session_timer) 1131 if (start_public_session_timer)
1131 StartPublicSessionAutoLoginTimer(); 1132 StartPublicSessionAutoLoginTimer();
1132 } 1133 }
1133 1134
1134 } // namespace chromeos 1135 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/app_launch_controller.cc ('k') | chrome/browser/chromeos/login/kiosk_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698