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

Side by Side Diff: chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.h

Issue 10191010: Re-implement the screensaver to use WebView instead of ExtensionDialogHost. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ut fix. Created 8 years, 7 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 #ifndef CHROME_BROWSER_CHROMEOS_KIOSK_MODE_KIOSK_MODE_SCREENSAVER_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_KIOSK_MODE_KIOSK_MODE_SCREENSAVER_H_
6 #define CHROME_BROWSER_CHROMEOS_KIOSK_MODE_KIOSK_MODE_SCREENSAVER_H_ 6 #define CHROME_BROWSER_CHROMEOS_KIOSK_MODE_KIOSK_MODE_SCREENSAVER_H_
7 #pragma once 7 #pragma once
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/file_path.h" 10 #include "base/file_path.h"
11 #include "base/memory/weak_ptr.h" 11 #include "base/memory/weak_ptr.h"
12 #include "chromeos/dbus/power_manager_client.h" 12 #include "chromeos/dbus/power_manager_client.h"
13 #include "content/public/browser/notification_observer.h" 13 #include "content/public/browser/notification_observer.h"
14 #include "content/public/browser/notification_registrar.h" 14 #include "content/public/browser/notification_registrar.h"
15 15
16 class Extension; 16 class Extension;
17 class Profile;
17 18
18 namespace chromeos { 19 namespace chromeos {
19 20
20 class KioskModeScreensaver : public PowerManagerClient::Observer, 21 class KioskModeScreensaver : public PowerManagerClient::Observer,
21 public content::NotificationObserver { 22 public content::NotificationObserver {
22 public: 23 public:
23 KioskModeScreensaver(); 24 KioskModeScreensaver();
24 virtual ~KioskModeScreensaver(); 25 virtual ~KioskModeScreensaver();
25 26
26 // NotificationObserver overrides: 27 // NotificationObserver overrides:
(...skipping 11 matching lines...) Expand all
38 // Get the screensaver path once KioskModeHelper is initialized. 39 // Get the screensaver path once KioskModeHelper is initialized.
39 void GetScreensaverCrxPath(); 40 void GetScreensaverCrxPath();
40 41
41 // Callback to receive the path to the screensaver extension's crx and call 42 // Callback to receive the path to the screensaver extension's crx and call
42 // the unpacker to unpack and load the crx. 43 // the unpacker to unpack and load the crx.
43 void ScreensaverPathCallback(const FilePath& screensaver_crx); 44 void ScreensaverPathCallback(const FilePath& screensaver_crx);
44 45
45 // Called back on the UI thread to Setup the screensaver with the now unpacked 46 // Called back on the UI thread to Setup the screensaver with the now unpacked
46 // and loaded extension. 47 // and loaded extension.
47 void SetupScreensaver(scoped_refptr<Extension> extension, 48 void SetupScreensaver(scoped_refptr<Extension> extension,
49 Profile* default_profile,
48 const FilePath& extension_base_path); 50 const FilePath& extension_base_path);
49 51
50 content::NotificationRegistrar registrar_; 52 content::NotificationRegistrar registrar_;
51 base::WeakPtrFactory<KioskModeScreensaver> weak_ptr_factory_; 53 base::WeakPtrFactory<KioskModeScreensaver> weak_ptr_factory_;
52 54
53 FilePath extension_base_path_; 55 FilePath extension_base_path_;
54 56
55 DISALLOW_COPY_AND_ASSIGN(KioskModeScreensaver); 57 DISALLOW_COPY_AND_ASSIGN(KioskModeScreensaver);
56 }; 58 };
57 59
58 void InitializeKioskModeScreensaver(); 60 void InitializeKioskModeScreensaver();
59 void ShutdownKioskModeScreensaver(); 61 void ShutdownKioskModeScreensaver();
60 62
61 } // namespace chromeos 63 } // namespace chromeos
62 64
63 #endif // CHROME_BROWSER_CHROMEOS_KIOSK_MODE_KIOSK_MODE_SCREENSAVER_H_ 65 #endif // CHROME_BROWSER_CHROMEOS_KIOSK_MODE_KIOSK_MODE_SCREENSAVER_H_
OLDNEW
« no previous file with comments | « ash/test/test_shell_delegate.cc ('k') | chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698