| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.h" | 5 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.h" |
| 6 | 6 |
| 7 #include "ash/screensaver/screensaver_view.h" | 7 #include "ash/screensaver/screensaver_view.h" |
| 8 #include "ash/shell.h" | 8 #include "ash/shell.h" |
| 9 #include "ash/wm/user_activity_detector.h" | 9 #include "ash/wm/user_activity_detector.h" |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 120 // Delete it. | 120 // Delete it. |
| 121 content::BrowserThread::PostTask( | 121 content::BrowserThread::PostTask( |
| 122 content::BrowserThread::FILE, | 122 content::BrowserThread::FILE, |
| 123 FROM_HERE, | 123 FROM_HERE, |
| 124 base::Bind( | 124 base::Bind( |
| 125 &extension_file_util::DeleteFile, extension_base_path_, true)); | 125 &extension_file_util::DeleteFile, extension_base_path_, true)); |
| 126 } | 126 } |
| 127 | 127 |
| 128 // In case we're shutting down without ever triggering the active | 128 // In case we're shutting down without ever triggering the active |
| 129 // notification and/or logging in. | 129 // notification and/or logging in. |
| 130 ash::Shell::GetInstance()->user_activity_detector()->RemoveObserver(this); | 130 if (ash::Shell::GetInstance() && |
| 131 ash::Shell::GetInstance()->user_activity_detector()) |
| 132 ash::Shell::GetInstance()->user_activity_detector()->RemoveObserver(this); |
| 131 registrar_.RemoveAll(); | 133 registrar_.RemoveAll(); |
| 132 } | 134 } |
| 133 | 135 |
| 134 void KioskModeScreensaver::GetScreensaverCrxPath() { | 136 void KioskModeScreensaver::GetScreensaverCrxPath() { |
| 135 chromeos::KioskModeSettings::Get()->GetScreensaverPath( | 137 chromeos::KioskModeSettings::Get()->GetScreensaverPath( |
| 136 base::Bind(&KioskModeScreensaver::ScreensaverPathCallback, | 138 base::Bind(&KioskModeScreensaver::ScreensaverPathCallback, |
| 137 weak_ptr_factory_.GetWeakPtr())); | 139 weak_ptr_factory_.GetWeakPtr())); |
| 138 } | 140 } |
| 139 | 141 |
| 140 void KioskModeScreensaver::ScreensaverPathCallback( | 142 void KioskModeScreensaver::ScreensaverPathCallback( |
| (...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 229 | 231 |
| 230 g_kiosk_mode_screensaver = new KioskModeScreensaver(); | 232 g_kiosk_mode_screensaver = new KioskModeScreensaver(); |
| 231 } | 233 } |
| 232 | 234 |
| 233 void ShutdownKioskModeScreensaver() { | 235 void ShutdownKioskModeScreensaver() { |
| 234 delete g_kiosk_mode_screensaver; | 236 delete g_kiosk_mode_screensaver; |
| 235 g_kiosk_mode_screensaver = NULL; | 237 g_kiosk_mode_screensaver = NULL; |
| 236 } | 238 } |
| 237 | 239 |
| 238 } // namespace chromeos | 240 } // namespace chromeos |
| OLD | NEW |