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

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: Addressed review comments. 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 905 matching lines...) Expand 10 before | Expand all | Expand 10 after
916 return; 916 return;
917 } 917 }
918 918
919 // The user chose a locale and a suitable keyboard layout or left both unset. 919 // The user chose a locale and a suitable keyboard layout or left both unset.
920 // Login can continue immediately. 920 // Login can continue immediately.
921 LoginAsPublicSessionInternal(new_user_context); 921 LoginAsPublicSessionInternal(new_user_context);
922 } 922 }
923 923
924 void ExistingUserController::LoginAsKioskApp(const std::string& app_id, 924 void ExistingUserController::LoginAsKioskApp(const std::string& app_id,
925 bool diagnostic_mode) { 925 bool diagnostic_mode) {
926 host_->StartAppLaunch(app_id, diagnostic_mode); 926 host_->StartAppLaunch(app_id, diagnostic_mode, false /* auto_start */);
Dmitry Polukhin 2015/02/06 13:41:32 Nit, I think better to create names local variable
Andrew T Wilson (Slow) 2015/02/06 20:43:50 Done.
927 } 927 }
928 928
929 void ExistingUserController::ConfigurePublicSessionAutoLogin() { 929 void ExistingUserController::ConfigurePublicSessionAutoLogin() {
930 std::string auto_login_account_id; 930 std::string auto_login_account_id;
931 cros_settings_->GetString(kAccountsPrefDeviceLocalAccountAutoLoginId, 931 cros_settings_->GetString(kAccountsPrefDeviceLocalAccountAutoLoginId,
932 &auto_login_account_id); 932 &auto_login_account_id);
933 const std::vector<policy::DeviceLocalAccount> device_local_accounts = 933 const std::vector<policy::DeviceLocalAccount> device_local_accounts =
934 policy::GetDeviceLocalAccounts(cros_settings_); 934 policy::GetDeviceLocalAccounts(cros_settings_);
935 935
936 public_session_auto_login_username_.clear(); 936 public_session_auto_login_username_.clear();
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
1122 is_login_in_progress_ = false; 1122 is_login_in_progress_ = false;
1123 1123
1124 // Reenable clicking on other windows and status area. 1124 // Reenable clicking on other windows and status area.
1125 login_display_->SetUIEnabled(true); 1125 login_display_->SetUIEnabled(true);
1126 1126
1127 if (start_public_session_timer) 1127 if (start_public_session_timer)
1128 StartPublicSessionAutoLoginTimer(); 1128 StartPublicSessionAutoLoginTimer();
1129 } 1129 }
1130 1130
1131 } // namespace chromeos 1131 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698