SystemMonitor: Pull device type into the device id

chrome/browser/media_gallery/media_device_notifications_window_win.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 "chrome/browser/media_gallery/media_device_notifications_window_win.h"
 
 #include <windows.h>
 #include <dbt.h>
 
 #include <string>
 
 #include "base/file_path.h"
 #include "base/string_number_conversions.h"
 #include "base/system_monitor/system_monitor.h"
 #include "base/win/wrapped_window_proc.h"
 #include "chrome/browser/media_gallery/media_device_notifications_utils.h"
+#include "chrome/browser/media_gallery/media_storage_util.h"
 #include "content/public/browser/browser_thread.h"
 
 using content::BrowserThread;
 
 namespace {
 
 const wchar_t WindowClassName[] = L"Chrome_MediaDeviceNotificationWindow";
 
 LRESULT GetVolumeName(LPCWSTR drive,
                       LPWSTR volume_name,
@@ skipping 65 matching lines @@
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   switch (event_type) {
     case DBT_DEVICEARRIVAL: {
       DWORD unitmask = GetVolumeBitMaskFromBroadcastHeader(data);
       for (int i = 0; unitmask; ++i, unitmask >>= 1) {
         if (unitmask & 0x01) {
           FilePath::StringType drive(L"_:\\");
           drive[0] = L'A' + i;
           WCHAR volume_name[MAX_PATH + 1];
           if ((*volume_name_func_)(drive.c_str(), volume_name, MAX_PATH + 1)) {
+            // TODO(kmadhusu) We need to look up a real device id as well as
+            // having a fall back for volume name.
+            std::string device_id = MediaStorageUtil::MakeDeviceId(
+                MediaStorageUtil::USB_MASS_STORAGE_WITH_DCIM,
+                base::IntToString(i));
             BrowserThread::PostTask(
                 BrowserThread::FILE, FROM_HERE,
                 base::Bind(&MediaDeviceNotificationsWindowWin::
-                    CheckDeviceTypeOnFileThread, this, base::IntToString(i),
+                    CheckDeviceTypeOnFileThread, this, device_id,
                     FilePath::StringType(volume_name), FilePath(drive)));
           }
         }
       }
       break;
     }
     case DBT_DEVICEREMOVECOMPLETE: {
       DWORD unitmask = GetVolumeBitMaskFromBroadcastHeader(data);
       for (int i = 0; unitmask; ++i, unitmask >>= 1) {
         if (unitmask & 0x01) {
+          std::string device_id = MediaStorageUtil::MakeDeviceId(
+              MediaStorageUtil::USB_MASS_STORAGE_WITH_DCIM,
+              base::IntToString(i));
           base::SystemMonitor* monitor = base::SystemMonitor::Get();
-          monitor->ProcessMediaDeviceDetached(base::IntToString(i));
+          monitor->ProcessMediaDeviceDetached(device_id);
         }
       }
       break;
     }
   }
   return TRUE;
 }
 
 void MediaDeviceNotificationsWindowWin::CheckDeviceTypeOnFileThread(
     const std::string& id,
@@ skipping 13 matching lines @@
 
 void MediaDeviceNotificationsWindowWin::ProcessMediaDeviceAttachedOnUIThread(
     const std::string& id,
     const FilePath::StringType& device_name,
     const FilePath& path) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   base::SystemMonitor* monitor = base::SystemMonitor::Get();
   monitor->ProcessMediaDeviceAttached(id,
                                       device_name,
-                                      base::SystemMonitor::TYPE_PATH,
                                       path.value());
 }
 
 LRESULT CALLBACK MediaDeviceNotificationsWindowWin::WndProc(
     HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam) {
   switch (message) {
     case WM_DEVICECHANGE:
       return OnDeviceChange(static_cast<UINT>(wparam),
                             static_cast<DWORD>(lparam));
     default:
@@ skipping 11 matching lines @@
     LPARAM lparam) {
   MediaDeviceNotificationsWindowWin* msg_wnd =
       reinterpret_cast<MediaDeviceNotificationsWindowWin*>(
           GetWindowLongPtr(hwnd, GWLP_USERDATA));
   if (msg_wnd)
     return msg_wnd->WndProc(hwnd, message, wparam, lparam);
   return ::DefWindowProc(hwnd, message, wparam, lparam);
 }
 
 }  // namespace chrome