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

Unified Diff: chrome/browser/chromeos/login/screens/user_selection_screen.cc

Issue 1929733002: Login Screen for Mus (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Document disabled features Created 4 years, 7 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
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/session/user_session_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/screens/user_selection_screen.cc
diff --git a/chrome/browser/chromeos/login/screens/user_selection_screen.cc b/chrome/browser/chromeos/login/screens/user_selection_screen.cc
index 3af4df5df9b82d86d688fe8245db0fc7c0aa80eb..942fa2ac9f28d84e261d925dde5bab803710c07f 100644
--- a/chrome/browser/chromeos/login/screens/user_selection_screen.cc
+++ b/chrome/browser/chromeos/login/screens/user_selection_screen.cc
@@ -124,7 +124,7 @@ UserSelectionScreen::UserSelectionScreen(const std::string& display_type)
UserSelectionScreen::~UserSelectionScreen() {
proximity_auth::ScreenlockBridge::Get()->SetLockHandler(nullptr);
ui::UserActivityDetector* activity_detector = ui::UserActivityDetector::Get();
- if (activity_detector->HasObserver(this))
+ if (activity_detector && activity_detector->HasObserver(this))
activity_detector->RemoveObserver(this);
}
@@ -262,7 +262,7 @@ void UserSelectionScreen::Init(const user_manager::UserList& users,
show_guest_ = show_guest;
ui::UserActivityDetector* activity_detector = ui::UserActivityDetector::Get();
- if (!activity_detector->HasObserver(this))
+ if (activity_detector && !activity_detector->HasObserver(this))
activity_detector->AddObserver(this);
}
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/session/user_session_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698