SystemMonitor: Pull device type into the device id

base/system_monitor/system_monitor.cc

 // Copyright (c) 2012 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 <utility>
 
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/stl_util.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 
 namespace base {
 
 static SystemMonitor* g_system_monitor = NULL;
 
 #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::MediaDeviceInfo::MediaDeviceInfo(
     const std::string& id,
     const string16& device_name,
-    MediaDeviceType device_type,
     const FilePath::StringType& device_location)
     : unique_id(id),
       name(device_name),
-      type(device_type),
       location(device_location) {
 }
 
 SystemMonitor::SystemMonitor()
     : power_observer_list_(new ObserverListThreadSafe<PowerObserver>()),
       devices_changed_observer_list_(
           new ObserverListThreadSafe<DevicesChangedObserver>()),
       battery_in_use_(false),
       suspended_(false) {
   DCHECK(!g_system_monitor);
@@ skipping 51 matching lines @@
   }
 }
 
 void SystemMonitor::ProcessDevicesChanged(DeviceType device_type) {
   NotifyDevicesChanged(device_type);
 }
 
 void SystemMonitor::ProcessMediaDeviceAttached(
     const std::string& id,
     const string16& name,
-    MediaDeviceType type,
     const FilePath::StringType& location) {
-  MediaDeviceInfo info(id, name, type, location);
+  MediaDeviceInfo info(id, name, location);
   if (ContainsKey(media_device_map_, id)) {
     // This can happen if our unique id scheme fails. Ignore the incoming
     // non-unique attachment.
     return;
   }
   media_device_map_.insert(std::make_pair(id, info));
-  NotifyMediaDeviceAttached(id, name, type, location);
+  NotifyMediaDeviceAttached(id, name, location);
 }
 
 void SystemMonitor::ProcessMediaDeviceDetached(const std::string& id) {
   MediaDeviceMap::iterator it = media_device_map_.find(id);
   if (it == media_device_map_.end())
     return;
   media_device_map_.erase(it);
   NotifyMediaDeviceDetached(id);
 }
 
@@ skipping 26 matching lines @@
 
 void SystemMonitor::NotifyDevicesChanged(DeviceType device_type) {
   DVLOG(1) << "DevicesChanged with device type " << device_type;
   devices_changed_observer_list_->Notify(
       &DevicesChangedObserver::OnDevicesChanged, device_type);
 }
 
 void SystemMonitor::NotifyMediaDeviceAttached(
     const std::string& id,
     const string16& name,
-    MediaDeviceType type,
     const FilePath::StringType& location) {
   DVLOG(1) << "MediaDeviceAttached with name " << UTF16ToUTF8(name)
            << " and id " << id;
   devices_changed_observer_list_->Notify(
-    &DevicesChangedObserver::OnMediaDeviceAttached, id, name, type, location);
+    &DevicesChangedObserver::OnMediaDeviceAttached, id, name, location);
 }
 
 void SystemMonitor::NotifyMediaDeviceDetached(const std::string& id) {
   DVLOG(1) << "MediaDeviceDetached for id " << id;
   devices_changed_observer_list_->Notify(
     &DevicesChangedObserver::OnMediaDeviceDetached, id);
 }
 
 void SystemMonitor::NotifyPowerStateChange() {
   DVLOG(1) << "PowerStateChange: " << (BatteryPower() ? "On" : "Off")
@@ skipping 10 matching lines @@
 void SystemMonitor::NotifyResume() {
   DVLOG(1) << "Power Resuming";
   power_observer_list_->Notify(&PowerObserver::OnResume);
 }
 
 void SystemMonitor::BatteryCheck() {
   ProcessPowerMessage(SystemMonitor::POWER_STATE_EVENT);
 }
 
 }  // namespace base