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

Unified Diff: chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc

Issue 10909129: Fix crash in screensaver shutdown. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 3 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc
diff --git a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc
index 9e1b7552c5057007d2c07ded6fc964a745a9807b..1daa428bab826254ed525cc130b127e838aef76b 100644
--- a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc
+++ b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc
@@ -127,7 +127,9 @@ KioskModeScreensaver::~KioskModeScreensaver() {
// In case we're shutting down without ever triggering the active
// notification and/or logging in.
- ash::Shell::GetInstance()->user_activity_detector()->RemoveObserver(this);
+ if (ash::Shell::GetInstance() &&
+ ash::Shell::GetInstance()->user_activity_detector())
+ ash::Shell::GetInstance()->user_activity_detector()->RemoveObserver(this);
registrar_.RemoveAll();
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698