Add notification for media changed, and notify volume mount watcher when it occurs.

components/storage_monitor/volume_mount_watcher_win.cc

 // Copyright 2014 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 "components/storage_monitor/volume_mount_watcher_win.h"
 
 #include <windows.h>
 
 #include <dbt.h>
 #include <fileapi.h>
+#include <shlobj.h>
 #include <winioctl.h>
 
 #include "base/bind_helpers.h"
 #include "base/metrics/histogram.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/task_runner_util.h"
@@ skipping 444 matching lines @@
           if (!(unitmask & 0x01))
             continue;
           HandleDeviceDetachEventOnUIThread(DriveNumberToFilePath(i).value());
         }
       }
       break;
     }
   }
 }
 
+// Surprisingly, we have to define this ourselves.
+typedef struct {
+  DWORD dwItem1;
+  DWORD dwItem2;
+} SHNOTIFYSTRUCT;

[vandebo (ex-Chrome), 2014/04/11 22:24:26]

Can you figure out a better name for this.

[Kevin Bailey, 2014/04/22 15:43:03]

Gone.

+
+void VolumeMountWatcherWin::OnMediaChanged(WPARAM wparam, LPARAM lparam) {
+  SHNOTIFYSTRUCT* shns = reinterpret_cast<SHNOTIFYSTRUCT*>(wparam);

[vandebo (ex-Chrome), 2014/04/11 22:24:26]

Seem to only use dwItem1, should we just cast is to DWORD* ?

[Kevin Bailey, 2014/04/22 15:43:03]

Ya, got rid of it entirely, and simplified the function.

+  switch (lparam) {
+    case SHCNE_MEDIAINSERTED: {
+      struct _ITEMIDLIST* pidl = reinterpret_cast<struct _ITEMIDLIST*>(
+          shns->dwItem1);
+      wchar_t sPath[MAX_PATH];
+      if (SHGetPathFromIDList(pidl, sPath)) {
+        std::vector<base::FilePath> paths;
+        paths.push_back(base::FilePath(sPath));
+        AddDevicesOnUIThread(paths);
+      } else {
+        DVLOG(1) << "MediaInserted: SHGetPathFromIDList failed";
+      }
+      break;
+    }
+    case SHCNE_MEDIAREMOVED: {
+      struct _ITEMIDLIST* pidl = reinterpret_cast<struct _ITEMIDLIST*>(
+          shns->dwItem1);
+      wchar_t sPath[MAX_PATH];
+      if (SHGetPathFromIDList(pidl, sPath)) {
+        HandleDeviceDetachEventOnUIThread(sPath);
+      } else {
+        DVLOG(1) << "MediaRemoved: SHGetPathFromIDList failed";
+      }
+      break;
+    }
+  }
+}
+
 void VolumeMountWatcherWin::SetNotifications(
     StorageMonitor::Receiver* notifications) {
   notifications_ = notifications;
 }
 
 VolumeMountWatcherWin::~VolumeMountWatcherWin() {
   weak_factory_.InvalidateWeakPtrs();
   device_info_worker_pool_->Shutdown();
 }
 
@@ skipping 38 matching lines @@
     callback.Run(StorageMonitor::EJECT_FAILURE);
     return;
   }
 
   task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&EjectDeviceInThreadPool, device, callback, task_runner_, 0));
 }
 
 }  // namespace storage_monitor