SystemMonitor refactoring: move power state monitor into a separate class called PowerMonitor

base/system_monitor/system_monitor.h

Index: base/system_monitor/system_monitor.h
diff --git a/base/system_monitor/system_monitor.h b/base/system_monitor/system_monitor.h
index ea95da89ccbe9fb6635b8ae905b6415ac977ca24..6543221b6c1c6ba5f076fea46cf53edcb1bba0ec 100644
--- a/base/system_monitor/system_monitor.h
+++ b/base/system_monitor/system_monitor.h
@@ -12,32 +12,11 @@
 #include "base/base_export.h"
 #include "base/basictypes.h"
 #include "base/file_path.h"
+#include "base/observer_list_threadsafe.h"
 #include "base/string16.h"
 #include "base/synchronization/lock.h"
 #include "build/build_config.h"
 
-// Windows HiRes timers drain the battery faster so we need to know the battery
-// status.  This isn't true for other platforms.
-#if defined(OS_WIN)
-#define ENABLE_BATTERY_MONITORING 1
-#else
-#undef ENABLE_BATTERY_MONITORING
-#endif  // !OS_WIN
-
-#include "base/observer_list_threadsafe.h"
-#if defined(ENABLE_BATTERY_MONITORING)
-#include "base/timer.h"
-#endif  // defined(ENABLE_BATTERY_MONITORING)
-
-#if defined(OS_MACOSX) && !defined(OS_IOS)
-#include <IOKit/pwr_mgt/IOPMLib.h>
-#include <IOKit/IOMessage.h>
-#endif  // OS_MACOSX && !OS_IOS
-
-#if defined(OS_IOS)
-#include <objc/runtime.h>
-#endif  // OS_IOS
-
 namespace base {
 
 // Class for monitoring various system-related subsystems
@@ -45,13 +24,6 @@ namespace base {
 // TODO(mbelshe):  Add support beyond just power management.
 class BASE_EXPORT SystemMonitor {
  public:
-  // Normalized list of power events.
-  enum PowerEvent {
-    POWER_STATE_EVENT,  // The Power status of the system has changed.
-    SUSPEND_EVENT,      // The system is being suspended.
-    RESUME_EVENT        // The system is being resumed.
-  };
-
   // Type of devices whose change need to be monitored, such as add/remove.
   enum DeviceType {
     DEVTYPE_AUDIO_CAPTURE,  // Audio capture device, e.g., microphone.
@@ -83,53 +55,9 @@ class BASE_EXPORT SystemMonitor {
   // Get the application-wide SystemMonitor (if not present, returns NULL).
   static SystemMonitor* Get();
 
-#if defined(OS_MACOSX)
-  // Allocate system resources needed by the SystemMonitor class.
-  //
-  // This function must be called before instantiating an instance of the class
-  // and before the Sandbox is initialized.
-#if !defined(OS_IOS)
-  static void AllocateSystemIOPorts();
-#else
-  static void AllocateSystemIOPorts() {}
-#endif  // OS_IOS
-#endif  // OS_MACOSX
-
   // Returns information for attached removable storage.
   std::vector<RemovableStorageInfo> GetAttachedRemovableStorage() const;
 
-  //
-  // Power-related APIs
-  //
-
-  // Is the computer currently on battery power.
-  // Can be called on any thread.
-  bool BatteryPower() const {
-    // Using a lock here is not necessary for just a bool.
-    return battery_in_use_;
-  }
-
-  // Callbacks will be called on the thread which creates the SystemMonitor.
-  // During the callback, Add/RemoveObserver will block until the callbacks
-  // are finished. Observers should implement quick callback functions; if
-  // lengthy operations are needed, the observer should take care to invoke
-  // the operation on an appropriate thread.
-  class BASE_EXPORT PowerObserver {
-   public:
-    // Notification of a change in power status of the computer, such
-    // as from switching between battery and A/C power.
-    virtual void OnPowerStateChange(bool on_battery_power) {}
-
-    // Notification that the system is suspending.
-    virtual void OnSuspend() {}
-
-    // Notification that the system is resuming.
-    virtual void OnResume() {}
-
-   protected:
-    virtual ~PowerObserver() {}
-  };
-
   class BASE_EXPORT DevicesChangedObserver {
    public:
     // Notification that the devices connected to the system have changed.
@@ -148,32 +76,17 @@ class BASE_EXPORT SystemMonitor {
     virtual ~DevicesChangedObserver() {}
   };
 
-  // Add a new observer.

[vandebo (ex-Chrome), 2012/10/11 00:58:43]

Leave a copy of this comment in this file.

[Hongbo Min, 2012/10/11 07:57:53]

Done.

-  // Can be called from any thread.
-  // Must not be called from within a notification callback.
-  void AddPowerObserver(PowerObserver* obs);
   void AddDevicesChangedObserver(DevicesChangedObserver* obs);
 
   // Remove an existing observer.
   // Can be called from any thread.
   // Must not be called from within a notification callback.
-  void RemovePowerObserver(PowerObserver* obs);
   void RemoveDevicesChangedObserver(DevicesChangedObserver* obs);
 
   // The ProcessFoo() style methods are a broken pattern and should not
   // be copied. Any significant addition to this class is blocked on
   // refactoring to improve the state of affairs. See http://crbug.com/149059
 
-#if defined(OS_WIN)
-  // Windows-specific handling of a WM_POWERBROADCAST message.

[vandebo (ex-Chrome), 2012/10/11 00:58:43]

Move this entire comment over.

[Hongbo Min, 2012/10/11 07:57:53]

Done.

-  // Embedders of this API should hook their top-level window
-  // message loop and forward WM_POWERBROADCAST through this call.
-  void ProcessWmPowerBroadcastMessage(int event_id);
-#endif
-
-  // Cross-platform handling of a power event.
-  void ProcessPowerMessage(PowerEvent event_id);
-
   // Cross-platform handling of a device change event.
   void ProcessDevicesChanged(DeviceType device_type);
   void ProcessRemovableStorageAttached(const std::string& id,
@@ -185,44 +98,14 @@ class BASE_EXPORT SystemMonitor {
   // Mapping of unique device id to device info tuple.
   typedef std::map<std::string, RemovableStorageInfo> RemovableStorageMap;
 
-#if defined(OS_MACOSX)
-  void PlatformInit();
-  void PlatformDestroy();
-#endif
-
-  // Platform-specific method to check whether the system is currently
-  // running on battery power.  Returns true if running on batteries,
-  // false otherwise.
-  bool IsBatteryPower();
-
-  // Checks the battery status and notifies observers if the battery
-  // status has changed.
-  void BatteryCheck();
-
   // Functions to trigger notifications.
   void NotifyDevicesChanged(DeviceType device_type);
   void NotifyRemovableStorageAttached(const std::string& id,
                                       const string16& name,
                                       const FilePath::StringType& location);
   void NotifyRemovableStorageDetached(const std::string& id);
-  void NotifyPowerStateChange();
-  void NotifySuspend();
-  void NotifyResume();
-
-  scoped_refptr<ObserverListThreadSafe<PowerObserver> > power_observer_list_;
   scoped_refptr<ObserverListThreadSafe<DevicesChangedObserver> >
       devices_changed_observer_list_;
-  bool battery_in_use_;
-  bool suspended_;
-
-#if defined(ENABLE_BATTERY_MONITORING)
-  base::OneShotTimer<SystemMonitor> delayed_battery_check_;
-#endif
-
-#if defined(OS_IOS)
-  // Holds pointers to system event notification observers.
-  std::vector<id> notification_observers_;
-#endif
 
   // For manipulating removable_storage_map_ structure.
   mutable base::Lock removable_storage_lock_;