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

Unified Diff: chrome/browser/chromeos/chrome_browser_main_chromeos.cc

Issue 1865133002: kiosk: Fix kiosk session restart (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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/chrome_browser_main_chromeos.cc
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
index f06a1e5c483865416e641041343ff71cead3c29c..2ad1fc58f33a9818ed55c73892acc54a765fed27 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -532,8 +532,9 @@ void ChromeBrowserMainPartsChromeos::PreProfileInit() {
user_manager::UserManager* user_manager = user_manager::UserManager::Get();
- if (policy::IsDeviceLocalAccountUser(account_id.GetUserEmail(), NULL) &&
- !user_manager->IsKnownUser(account_id)) {
+ if (policy::IsDeviceLocalAccountUser(account_id.GetUserEmail(), nullptr) &&
+ !user_manager->IsKnownUser(account_id) &&
bartfab (slow) 2016/04/07 14:55:42 Why is the kiosk user not a known user? We explici
xiyuan 2016/04/07 21:43:57 Makes sense to make kiosk apps part of known users
+ !KioskAppManager::Get()->GetAppByAccountId(account_id, nullptr)) {
// When a device-local account is removed, its policy is deleted from disk
// immediately. If a session using this account happens to be in progress,
// the session is allowed to continue with policy served from an in-memory

Powered by Google App Engine
This is Rietveld 408576698