Add Media device notification to SystemMonitor and Mac impl

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"
+#include "base/file_path.h"

[Lei Zhang, 2012/02/14 02:14:24]

you can forward declare "class FilePath" and inclide this in system_monitor.cc.

[vandebo (ex-Chrome), 2012/02/14 21:23:23]

I tried that, but the observer code needs the full definition.

[vandebo (ex-Chrome), 2012/02/15 23:13:36]

I think I was trying to declare it in the base namespace.  It works now.

 #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
 
@@ skipping 14 matching lines @@
 // 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.
   };
 
+  typedef unsigned long DeviceIdType;
+
   // Create SystemMonitor. Only one SystemMonitor instance per application
   // is allowed.
   SystemMonitor();
   ~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.
@@ skipping 31 matching lines @@
     // 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.
+    // This is only implemented on Windows currently.

[Lei Zhang, 2012/02/14 02:14:24]

Really? Is content::GamepadProvider() Windows-only?

[vandebo (ex-Chrome), 2012/02/14 21:23:23]

The only caller of ProcessDevicesChanged is in the windows code.  We may
register for the callback on all platforms, but it only happens on Windows.

     virtual void OnDevicesChanged() {}
 
+    // When a media device is attached or detached, one of these two events
+    // if triggered.
+    // TODO(vandebo) Pass an appropriate device identifier or way to interact
+    // with the devices instead of FilePath.
+    virtual void OnMediaDeviceAttached(const DeviceIdType& id,
+                                       const std::string& name,
+                                       const FilePath& path) {}
+
+    virtual void OnMediaDeviceDetached(const DeviceIdType& id) {}
+
    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);
 
   // 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);
 
 #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();
+  void ProcessMediaDeviceAttached(const DeviceIdType& id,
+                                  const std::string& name,
+                                  const FilePath& path);
+  void ProcessMediaDeviceDetached(const DeviceIdType& id);
 
  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 NotifyMediaDeviceAttached(const DeviceIdType& id,
+                                 const std::string& name, const FilePath& path);

[willchan no longer on Chromium, 2012/02/14 06:43:20]

Move to the next line as per chromium style guide
(http://www.chromium.org/developers/coding-style#TOC-Code-formatting) which
says:
For function declarations and definitions, put each argument on a separate line
unless everything fits on one line. You should only break this rule when the
arguments have some logical association like "int x, int y" or "char* str, int
str_len" where putting a few arguments together makes semantic sense.  Do NOT
collapse function arguments together just because you have "too many"

[vandebo (ex-Chrome), 2012/02/14 21:23:23]

Done.

+  void NotifyMediaDeviceDetached(const DeviceIdType& 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
 
   DISALLOW_COPY_AND_ASSIGN(SystemMonitor);
 };
 
 }  // namespace base
 
 #endif  // BASE_SYSTEM_MONITOR_SYSTEM_MONITOR_H_