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

Unified Diff: chrome/browser/chromeos/login/ui/webui_login_display.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
Index: chrome/browser/chromeos/login/ui/webui_login_display.cc
diff --git a/chrome/browser/chromeos/login/ui/webui_login_display.cc b/chrome/browser/chromeos/login/ui/webui_login_display.cc
index 0a8f24facae619ab76db32d15d8c91817f68888b..149eb54907074409f173a428f944c2834afd503f 100644
--- a/chrome/browser/chromeos/login/ui/webui_login_display.cc
+++ b/chrome/browser/chromeos/login/ui/webui_login_display.cc
@@ -35,7 +35,7 @@ WebUILoginDisplay::~WebUILoginDisplay() {
if (webui_handler_)
webui_handler_->ResetSigninScreenHandlerDelegate();
ui::UserActivityDetector* activity_detector = ui::UserActivityDetector::Get();
- if (activity_detector->HasObserver(this))
+ if (activity_detector && activity_detector->HasObserver(this))
activity_detector->RemoveObserver(this);
}
@@ -61,7 +61,7 @@ void WebUILoginDisplay::Init(const user_manager::UserList& users,
show_new_user_ = show_new_user;
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 | « chrome/browser/chromeos/login/ui/login_display_host_impl.cc ('k') | chrome/browser/chromeos/login/ui/webui_login_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698