chromeos: More power-related cleanup.

ash/system/chromeos/power/power_event_observer.h

Index: ash/system/chromeos/power/power_event_observer.h
diff --git a/ash/system/chromeos/power/suspend_observer.h b/ash/system/chromeos/power/power_event_observer.h
similarity index 56%
rename from ash/system/chromeos/power/suspend_observer.h
rename to ash/system/chromeos/power/power_event_observer.h
index 17cc931da67f5131f41407b09bfccd18187b2784..aeb89b9e2eb07460235364df7b681fd325ca90db 100644
--- a/ash/system/chromeos/power/suspend_observer.h
+++ b/ash/system/chromeos/power/power_event_observer.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ASH_SYSTEM_CHROMEOS_POWER_SUSPEND_OBSERVER_H_
-#define ASH_SYSTEM_CHROMEOS_POWER_SUSPEND_OBSERVER_H_
+#ifndef ASH_SYSTEM_CHROMEOS_POWER_POWER_EVENT_OBSERVER_H_
+#define ASH_SYSTEM_CHROMEOS_POWER_POWER_EVENT_OBSERVER_H_
 
 #include "base/basictypes.h"
 #include "base/callback.h"
@@ -14,25 +14,23 @@
 namespace ash {
 namespace internal {
 
-// A class to observe suspend events.
-class SuspendObserver : public chromeos::PowerManagerClient::Observer,
-                        public chromeos::SessionManagerClient::Observer {
+// A class that observes power-management-related events.
+class PowerEventObserver : public chromeos::PowerManagerClient::Observer,
+                           public chromeos::SessionManagerClient::Observer {
  public:
   // This class registers/unregisters itself as an observer in ctor/dtor.
-  SuspendObserver();
-  virtual ~SuspendObserver();
+  PowerEventObserver();
+  virtual ~PowerEventObserver();
 
-  // chromeos::PowerManagerClient::Observer override.
+  // chromeos::PowerManagerClient::Observer overrides:
+  virtual void BrightnessChanged(int level, bool user_initiated) OVERRIDE;
   virtual void SuspendImminent() OVERRIDE;
+  virtual void SystemResumed(const base::TimeDelta& sleep_duration) OVERRIDE;
 
   // chromeos::SessionManagerClient::Observer overrides.
   virtual void ScreenIsLocked() OVERRIDE;
   virtual void ScreenIsUnlocked() OVERRIDE;
 
- private:
-  chromeos::PowerManagerClient* power_client_;  // not owned
-  chromeos::SessionManagerClient* session_client_;  // not owned
-
   // Is the screen currently locked?
   bool screen_locked_;
 
@@ -40,10 +38,11 @@ class SuspendObserver : public chromeos::PowerManagerClient::Observer,
   // system is ready to be suspended.
   base::Closure screen_lock_callback_;
 
-  DISALLOW_COPY_AND_ASSIGN(SuspendObserver);
+ private:
+  DISALLOW_COPY_AND_ASSIGN(PowerEventObserver);
 };
 
 }  // namespace internal
-}  // namespace ash
+}  // namespace chromeos
 
-#endif  // ASH_SYSTEM_CHROMEOS_POWER_SUSPEND_OBSERVER_H_
+#endif  // ASH_SYSTEM_CHROMEOS_POWER_POWER_EVENT_OBSERVER_H_