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

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

Issue 26692002: chromeos: More power-related cleanup. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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
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 409e12c8ae60b000fbd0a23af988f6597834068c..ee471a4154d0246e4404cfe0b37c4de7329ae5fd 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.h
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.h
@@ -23,13 +23,12 @@ namespace chromeos {
class BrightnessObserver;
class DataPromoNotification;
class DisplayConfigurationObserver;
+class ExtensionSystemEventObserver;
class IdleActionWarningObserver;
class MagnificationManager;
class PeripheralBatteryObserver;
class PowerButtonObserver;
class PowerPrefs;
-class ResumeObserver;
-class ScreenLockObserver;
class ScreensaverController;
class SessionManagerObserver;
class SwapMetrics;
@@ -70,8 +69,7 @@ class ChromeBrowserMainPartsChromeos : public ChromeBrowserMainPartsLinux {
scoped_ptr<BrightnessObserver> brightness_observer_;
scoped_ptr<DisplayConfigurationObserver> display_configuration_observer_;
scoped_ptr<default_app_order::ExternalLoader> app_order_loader_;
- scoped_ptr<ResumeObserver> resume_observer_;
- scoped_ptr<ScreenLockObserver> screen_lock_observer_;
+ scoped_ptr<ExtensionSystemEventObserver> extension_system_event_observer_;
scoped_ptr<ScreensaverController> screensaver_controller_;
scoped_ptr<PeripheralBatteryObserver> peripheral_battery_observer_;
scoped_ptr<PowerPrefs> power_prefs_;

Powered by Google App Engine
This is Rietveld 408576698