| 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_;
|
|
|