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

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: restore "PublicAccounts" local state 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..c75399572fc6d06971b770721a749b6a0738cc0b 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -532,7 +532,7 @@ void ChromeBrowserMainPartsChromeos::PreProfileInit() {
user_manager::UserManager* user_manager = user_manager::UserManager::Get();
- if (policy::IsDeviceLocalAccountUser(account_id.GetUserEmail(), NULL) &&
+ if (policy::IsDeviceLocalAccountUser(account_id.GetUserEmail(), nullptr) &&
!user_manager->IsKnownUser(account_id)) {
// 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,
@@ -662,7 +662,7 @@ void ChromeBrowserMainPartsChromeos::PostProfileInit() {
manager->SetState(session_manager->GetDefaultIMEState(profile()));
- bool is_running_test = parameters().ui_task != NULL;
+ bool is_running_test = parameters().ui_task != nullptr;
g_browser_process->platform_part()->InitializeSessionManager(
parsed_command_line(), profile(), is_running_test);
g_browser_process->platform_part()->SessionManager()->Start();

Powered by Google App Engine
This is Rietveld 408576698