Revert 109960 - Send WM_DEVICECHANGE message through SystemMonitor

base/system_monitor/system_monitor.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef BASE_SYSTEM_MONITOR_SYSTEM_MONITOR_H_
 #define BASE_SYSTEM_MONITOR_SYSTEM_MONITOR_H_
 #pragma once
 
 #include "base/base_export.h"
 #include "base/basictypes.h"
@@ skipping 72 matching lines @@
     // 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.
-    virtual void OnDevicesChanged() {}
-
-   protected:
-    virtual ~DevicesChangedObserver() {}
-  };
-
   // Add a new observer.
   // Can be called from any thread.
   // Must not be called from within a notification callback.
-  void AddPowerObserver(PowerObserver* obs);
-  void AddDevicesChangedObserver(DevicesChangedObserver* obs);
+  void AddObserver(PowerObserver* 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);
+  void RemoveObserver(PowerObserver* obs);
 
 #if defined(OS_WIN)
   // Windows-specific handling of a WM_POWERBROADCAST message.
   // 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();
-
  private:
 #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();
   void NotifyPowerStateChange();
   void NotifySuspend();
   void NotifyResume();
 
-  scoped_refptr<ObserverListThreadSafe<PowerObserver> > power_observer_list_;
-  scoped_refptr<ObserverListThreadSafe<DevicesChangedObserver> >
-      devices_changed_observer_list_;
+  scoped_refptr<ObserverListThreadSafe<PowerObserver> > observer_list_;
   bool battery_in_use_;
   bool suspended_;
 
 #if defined(ENABLE_BATTERY_MONITORING)
   base::OneShotTimer<SystemMonitor> delayed_battery_check_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(SystemMonitor);
 };
 
 }  // namespace base
 
 #endif  // BASE_SYSTEM_MONITOR_SYSTEM_MONITOR_H_