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

Side by Side Diff: chrome/browser/chromeos/login/existing_user_controller.cc

Issue 995763004: kiosk: Fix bailout shortcut not working. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 827 matching lines...) Expand 10 before | Expand all | Expand 10 after
838 return; 838 return;
839 } 839 }
840 840
841 // The user chose a locale and a suitable keyboard layout or left both unset. 841 // The user chose a locale and a suitable keyboard layout or left both unset.
842 // Login can continue immediately. 842 // Login can continue immediately.
843 LoginAsPublicSessionInternal(new_user_context); 843 LoginAsPublicSessionInternal(new_user_context);
844 } 844 }
845 845
846 void ExistingUserController::LoginAsKioskApp(const std::string& app_id, 846 void ExistingUserController::LoginAsKioskApp(const std::string& app_id,
847 bool diagnostic_mode) { 847 bool diagnostic_mode) {
848 // Reenable login display so that bailout shortcut key works.
849 login_display_->SetUIEnabled(true);
850
848 const bool auto_start = false; 851 const bool auto_start = false;
849 host_->StartAppLaunch(app_id, diagnostic_mode, auto_start); 852 host_->StartAppLaunch(app_id, diagnostic_mode, auto_start);
850 } 853 }
851 854
852 void ExistingUserController::ConfigurePublicSessionAutoLogin() { 855 void ExistingUserController::ConfigurePublicSessionAutoLogin() {
853 std::string auto_login_account_id; 856 std::string auto_login_account_id;
854 cros_settings_->GetString(kAccountsPrefDeviceLocalAccountAutoLoginId, 857 cros_settings_->GetString(kAccountsPrefDeviceLocalAccountAutoLoginId,
855 &auto_login_account_id); 858 &auto_login_account_id);
856 const std::vector<policy::DeviceLocalAccount> device_local_accounts = 859 const std::vector<policy::DeviceLocalAccount> device_local_accounts =
857 policy::GetDeviceLocalAccounts(cros_settings_); 860 policy::GetDeviceLocalAccounts(cros_settings_);
(...skipping 302 matching lines...) Expand 10 before | Expand all | Expand 10 after
1160 login_display_->SetUIEnabled(true); 1163 login_display_->SetUIEnabled(true);
1161 // Restart the auto-login timer. 1164 // Restart the auto-login timer.
1162 StartPublicSessionAutoLoginTimer(); 1165 StartPublicSessionAutoLoginTimer();
1163 } 1166 }
1164 1167
1165 PerformPreLoginActions(user_context); 1168 PerformPreLoginActions(user_context);
1166 PerformLogin(user_context, LoginPerformer::AUTH_MODE_INTERNAL); 1169 PerformLogin(user_context, LoginPerformer::AUTH_MODE_INTERNAL);
1167 } 1170 }
1168 1171
1169 } // namespace chromeos 1172 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698