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

Side by Side Diff: components/user_manager/user_manager_base.cc

Issue 2498613003: Add ARC++ kiosk menu items and ability to start kiosk session. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 1 month 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 | « components/user_manager/user_manager_base.h ('k') | 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 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 "components/user_manager/user_manager_base.h" 5 #include "components/user_manager/user_manager_base.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <set> 8 #include <set>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 GuestUserLoggedIn(); 154 GuestUserLoggedIn();
155 } else if (IsDemoApp(account_id)) { 155 } else if (IsDemoApp(account_id)) {
156 DemoAccountLoggedIn(); 156 DemoAccountLoggedIn();
157 } else { 157 } else {
158 EnsureUsersLoaded(); 158 EnsureUsersLoaded();
159 159
160 if (user && user->GetType() == USER_TYPE_PUBLIC_ACCOUNT) { 160 if (user && user->GetType() == USER_TYPE_PUBLIC_ACCOUNT) {
161 PublicAccountUserLoggedIn(user); 161 PublicAccountUserLoggedIn(user);
162 } else if (user && user->GetType() == USER_TYPE_KIOSK_APP) { 162 } else if (user && user->GetType() == USER_TYPE_KIOSK_APP) {
163 KioskAppLoggedIn(user); 163 KioskAppLoggedIn(user);
164 } else if (user && user->GetType() == USER_TYPE_ARC_KIOSK_APP) {
165 ArcKioskAppLoggedIn(user);
164 } else if ((user && user->GetType() == USER_TYPE_SUPERVISED) || 166 } else if ((user && user->GetType() == USER_TYPE_SUPERVISED) ||
165 (!user && IsSupervisedAccountId(account_id))) { 167 (!user && IsSupervisedAccountId(account_id))) {
166 SupervisedUserLoggedIn(account_id); 168 SupervisedUserLoggedIn(account_id);
167 } else if (browser_restart && 169 } else if (browser_restart &&
168 IsDeviceLocalAccountMarkedForRemoval(account_id)) { 170 IsDeviceLocalAccountMarkedForRemoval(account_id)) {
169 PublicAccountUserLoggedIn(User::CreatePublicAccountUser(account_id)); 171 PublicAccountUserLoggedIn(User::CreatePublicAccountUser(account_id));
170 } else if (account_id != GetOwnerAccountId() && !user && 172 } else if (account_id != GetOwnerAccountId() && !user &&
171 (AreEphemeralUsersEnabled() || browser_restart)) { 173 (AreEphemeralUsersEnabled() || browser_restart)) {
172 RegularUserLoggedInAsEphemeral(account_id); 174 RegularUserLoggedInAsEphemeral(account_id);
173 } else { 175 } else {
(...skipping 885 matching lines...) Expand 10 before | Expand all | Expand 10 after
1059 } 1061 }
1060 1062
1061 void UserManagerBase::DeleteUser(User* user) { 1063 void UserManagerBase::DeleteUser(User* user) {
1062 const bool is_active_user = (user == active_user_); 1064 const bool is_active_user = (user == active_user_);
1063 delete user; 1065 delete user;
1064 if (is_active_user) 1066 if (is_active_user)
1065 active_user_ = nullptr; 1067 active_user_ = nullptr;
1066 } 1068 }
1067 1069
1068 } // namespace user_manager 1070 } // namespace user_manager
OLDNEW
« no previous file with comments | « components/user_manager/user_manager_base.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698