Add Media device notification to SystemMonitor and Mac impl

base/system_monitor/system_monitor.cc

 // 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.
 
 #include "base/system_monitor/system_monitor.h"
 
 #include "base/logging.h"
 #include "base/message_loop.h"
+#include "base/string_util.h"

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

not needed?

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

Done.

 #include "base/time.h"
 
 namespace base {
 
 static SystemMonitor* g_system_monitor = NULL;

[Lei Zhang, 2012/02/14 01:07:22]

Should this be a LazyInstance?

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

SystemMonitor is setup in BrowserMainLoop, so there aren't any thread safety
issues.

 
 #if defined(ENABLE_BATTERY_MONITORING)
 // The amount of time (in ms) to wait before running the initial
 // battery check.
 static int kDelayedBatteryCheckMs = 10 * 1000;
 #endif  // defined(ENABLE_BATTERY_MONITORING)
 
 SystemMonitor::SystemMonitor()
     : power_observer_list_(new ObserverListThreadSafe<PowerObserver>()),
       devices_changed_observer_list_(
@@ skipping 52 matching lines @@
         NotifySuspend();
       }
       break;
   }
 }
 
 void SystemMonitor::ProcessDevicesChanged() {
   NotifyDevicesChanged();
 }
 
+void SystemMonitor::ProcessMediaDeviceAttached(const DeviceIdType& id,
+                                               const std::string& name,
+                                               const FilePath& path) {
+  NotifyMediaDeviceAttached(id, name, path);
+}
+
+void SystemMonitor::ProcessMediaDeviceDetached(const DeviceIdType& id) {
+  NotifyMediaDeviceDetached(id);
+}
+
 void SystemMonitor::AddPowerObserver(PowerObserver* obs) {
   power_observer_list_->AddObserver(obs);
 }
 
 void SystemMonitor::RemovePowerObserver(PowerObserver* obs) {
   power_observer_list_->RemoveObserver(obs);
 }
 
 void SystemMonitor::AddDevicesChangedObserver(DevicesChangedObserver* obs) {
   devices_changed_observer_list_->AddObserver(obs);
 }
 
 void SystemMonitor::RemoveDevicesChangedObserver(DevicesChangedObserver* obs) {
   devices_changed_observer_list_->RemoveObserver(obs);
 }
 
 void SystemMonitor::NotifyDevicesChanged() {
   DVLOG(1) << "DevicesChanged";
   devices_changed_observer_list_->Notify(
     &DevicesChangedObserver::OnDevicesChanged);
 }
 
+void SystemMonitor::NotifyMediaDeviceAttached(const DeviceIdType& id,
+                                              const std::string& name,
+                                              const FilePath& path) {
+  DVLOG(1) << "MediaDeviceAttached with name " << name << " and id " << id;
+  devices_changed_observer_list_->Notify(
+    &DevicesChangedObserver::OnMediaDeviceAttached, id, name, path);
+}
+
+void SystemMonitor::NotifyMediaDeviceDetached(const DeviceIdType& id) {
+  DVLOG(1) << "MediaDeviceDetached for id " << id;
+  devices_changed_observer_list_->Notify(
+    &DevicesChangedObserver::OnMediaDeviceDetached, id);
+}
+
 void SystemMonitor::NotifyPowerStateChange() {
   DVLOG(1) << "PowerStateChange: " << (BatteryPower() ? "On" : "Off")
            << " battery";
   power_observer_list_->Notify(&PowerObserver::OnPowerStateChange,
                                BatteryPower());
 }
 
 void SystemMonitor::NotifySuspend() {
   DVLOG(1) << "Power Suspending";
   power_observer_list_->Notify(&PowerObserver::OnSuspend);
 }
 
 void SystemMonitor::NotifyResume() {
   DVLOG(1) << "Power Resuming";
   power_observer_list_->Notify(&PowerObserver::OnResume);
 }
 
 void SystemMonitor::BatteryCheck() {

[Lei Zhang, 2012/02/14 01:58:01]

Also, this can be wrapped in #if defined(ENABLE_BATTERY_MONITORING)

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

It could be, but I'm not sure there's any gain to be had.

[Lei Zhang, 2012/02/15 22:55:45]

It's just dead code on non-Windows platforms. No point in having it.

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

Fine. Done.

   ProcessPowerMessage(SystemMonitor::POWER_STATE_EVENT);
 }
 
 }  // namespace base