| 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);
|
| }
|
|
|
|
|