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

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

Issue 11264017: On active, dismiss the retail mode screensaver immidiately. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removed irrelevant test. Created 8 years, 2 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/kiosk_mode/kiosk_mode_screensaver.cc » ('j') | 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.h
diff --git a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.h b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.h
index 004c5fc10b7898c916c17016fbe8a4fc444e5440..5b4ca4f656a6953d97b1f6054fdb6b61f9b460d2 100644
--- a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.h
+++ b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.h
@@ -9,8 +9,6 @@
#include "base/basictypes.h"
#include "base/file_path.h"
#include "base/memory/weak_ptr.h"
-#include "content/public/browser/notification_observer.h"
-#include "content/public/browser/notification_registrar.h"
namespace extensions {
class Extension;
@@ -18,8 +16,7 @@ class Extension;
namespace chromeos {
-class KioskModeScreensaver : public ash::UserActivityObserver,
- public content::NotificationObserver {
+class KioskModeScreensaver : public ash::UserActivityObserver {
public:
KioskModeScreensaver();
virtual ~KioskModeScreensaver();
@@ -27,11 +24,6 @@ class KioskModeScreensaver : public ash::UserActivityObserver,
private:
friend class KioskModeScreensaverTest;
- // NotificationObserver overrides:
- virtual void Observe(int type,
- const content::NotificationSource& source,
- const content::NotificationDetails& details) OVERRIDE;
-
// UserActivityObserver::Observer overrides:
virtual void OnUserActivity() OVERRIDE;
@@ -48,7 +40,6 @@ class KioskModeScreensaver : public ash::UserActivityObserver,
void SetupScreensaver(scoped_refptr<extensions::Extension> extension,
const FilePath& extension_base_path);
- content::NotificationRegistrar registrar_;
base::WeakPtrFactory<KioskModeScreensaver> weak_ptr_factory_;
FilePath extension_base_path_;
« no previous file with comments | « no previous file | chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698