diff options
| author | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-21 03:02:34 +0000 |
|---|---|---|
| committer | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-21 03:02:34 +0000 |
| commit | 1c321ee57a522e891d91a41a09bd900f0afd6f0d (patch) | |
| tree | bb6e35526d52b50d8e37216e8605c7b4aa08c86a /chrome/browser/chromeos/kiosk_mode | |
| parent | e2a374f50043586ff684e0720bbbd99b9aa15c07 (diff) | |
| download | chromium_src-1c321ee57a522e891d91a41a09bd900f0afd6f0d.zip chromium_src-1c321ee57a522e891d91a41a09bd900f0afd6f0d.tar.gz chromium_src-1c321ee57a522e891d91a41a09bd900f0afd6f0d.tar.bz2 | |
Move Extension into extensions namespace
BUG=117262
TBR=aa@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10375021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138074 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/kiosk_mode')
| -rw-r--r-- | chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.h | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc index caa1581..4063852 100644 --- a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc +++ b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc @@ -21,6 +21,8 @@ #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" +using extensions::Extension; + namespace chromeos { typedef base::Callback<void( diff --git a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.h b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.h index 449539f..701c18b 100644 --- a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.h +++ b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.h @@ -13,9 +13,12 @@ #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" -class Extension; class Profile; +namespace extensions { +class Extension; +} + namespace chromeos { class KioskModeScreensaver : public PowerManagerClient::Observer, @@ -45,7 +48,7 @@ class KioskModeScreensaver : public PowerManagerClient::Observer, // Called back on the UI thread to Setup the screensaver with the now unpacked // and loaded extension. - void SetupScreensaver(scoped_refptr<Extension> extension, + void SetupScreensaver(scoped_refptr<extensions::Extension> extension, Profile* default_profile, const FilePath& extension_base_path); |