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

Unified Diff: chrome/browser/chromeos/chrome_browser_main_chromeos.h

Issue 12775019: chromeos: Remove PowerStateOverride. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: apply review feedback Created 7 years, 9 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
Index: chrome/browser/chromeos/chrome_browser_main_chromeos.h
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.h b/chrome/browser/chromeos/chrome_browser_main_chromeos.h
index f80bfd397067c3a38250413d6b97cba64a783b83..7a1a8ebfc3b2905cec3ce79fc249d720ed8bf4f7 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.h
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.h
@@ -15,6 +15,10 @@ namespace contacts {
class ContactManager;
}
+namespace content {
+class PowerSaveBlocker;
+}
+
namespace chromeos {
class BrightnessObserver;
@@ -23,7 +27,6 @@ class KioskAppLauncher;
class MagnificationManager;
class OutputObserver;
class PowerButtonObserver;
-class PowerStateOverride;
class ResumeObserver;
class ScreenDimmingObserver;
class ScreenLockObserver;
@@ -87,7 +90,7 @@ class ChromeBrowserMainPartsChromeos : public ChromeBrowserMainPartsLinux {
scoped_ptr<ScreenLockObserver> screen_lock_observer_;
scoped_ptr<ScreensaverController> screensaver_controller_;
scoped_ptr<PowerButtonObserver> power_button_observer_;
- scoped_refptr<PowerStateOverride> power_state_override_;
+ scoped_ptr<content::PowerSaveBlocker> kiosk_mode_power_save_blocker_;
scoped_ptr<UserActivityNotifier> user_activity_notifier_;
scoped_ptr<VideoActivityNotifier> video_activity_notifier_;
scoped_ptr<ScreenDimmingObserver> screen_dimming_observer_;
« no previous file with comments | « no previous file | chrome/browser/chromeos/chrome_browser_main_chromeos.cc » ('j') | chromeos/dbus/power_manager_client.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698