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

components/storage_monitor/storage_monitor_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/storage_monitor_win.h"
 
 #include <windows.h>
 #include <dbt.h>
 #include <fileapi.h>
+#include <shlobj.h>
 
 #include "base/win/wrapped_window_proc.h"
 #include "components/storage_monitor/portable_device_watcher_win.h"
 #include "components/storage_monitor/removable_device_constants.h"
 #include "components/storage_monitor/storage_info.h"
 #include "components/storage_monitor/volume_mount_watcher_win.h"
 
 // StorageMonitorWin -------------------------------------------------------
 
 namespace storage_monitor {
@@ skipping 16 matching lines @@
   volume_mount_watcher_->SetNotifications(NULL);
   portable_device_watcher_->SetNotifications(NULL);
 
   if (window_)
     DestroyWindow(window_);
 
   if (window_class_)
     UnregisterClass(MAKEINTATOM(window_class_), instance_);
 }
 
+#define WM_USER_MEDIACHANGED (WM_USER+1)

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

Put this on before line 18

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

Done.

+
+void StorageMonitorWin::ChangeNotifyRegister() {

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

Could also just put this code in the Init method, presumably with a comment
saying that it registers for disk change events.

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

It's a little messy, and would add entirely new calls and a local variable. I'm
happy to include it if you like.

I could also move it down, to preserve the class definition order.

[vandebo (ex-Chrome), 2014/04/22 18:07:42]

I think inlining it would be fine, but leaving it a seperate function is also
fine.

+  LPITEMIDLIST ppidl;
+  if (SHGetSpecialFolderLocation(window_, CSIDL_DESKTOP, &ppidl) == NOERROR) {
+    SHChangeNotifyEntry shCNE;
+    shCNE.pidl = ppidl;
+    shCNE.fRecursive = TRUE;
+    ULONG result = SHChangeNotifyRegister(window_, SHCNE_DISKEVENTS,

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

result isn't used, inline the if

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

Done.

+        SHCNE_MEDIAINSERTED|SHCNE_MEDIAREMOVED,
+        WM_USER_MEDIACHANGED, 1, &shCNE);
+    if (!result)
+      DVLOG(1) << "SHChangeNotifyRegister FAILED";
+  } else {
+    DVLOG(1) << "SHGetSpecialFolderLocation FAILED";
+  }
+}
+
 void StorageMonitorWin::Init() {
   WNDCLASSEX window_class;
   base::win::InitializeWindowClass(
       L"Chrome_StorageMonitorWindow",
       &base::win::WrappedWindowProc<StorageMonitorWin::WndProcThunk>,
       0, 0, 0, NULL, NULL, NULL, NULL, NULL,
       &window_class);
   instance_ = window_class.hInstance;
   window_class_ = RegisterClassEx(&window_class);
   DCHECK(window_class_);
 
   window_ = CreateWindow(MAKEINTATOM(window_class_), 0, 0, 0, 0, 0, 0, 0, 0,
                          instance_, 0);
   SetWindowLongPtr(window_, GWLP_USERDATA, reinterpret_cast<LONG_PTR>(this));
   volume_mount_watcher_->Init();
   portable_device_watcher_->Init(window_);
+  ChangeNotifyRegister();
 }
 
 bool StorageMonitorWin::GetStorageInfoForPath(const base::FilePath& path,
                                               StorageInfo* device_info) const {
   DCHECK(device_info);
 
   // TODO(gbillock): Move this logic up to StorageMonitor.
   // If we already know the StorageInfo for the path, just return it.
   // This will account for portable devices as well.
   std::vector<StorageInfo> attached_devices = GetAllAvailableStorages();
@@ skipping 53 matching lines @@
 // static
 LRESULT CALLBACK StorageMonitorWin::WndProcThunk(HWND hwnd, UINT message,
                                                  WPARAM wparam, LPARAM lparam) {
   StorageMonitorWin* msg_wnd = reinterpret_cast<StorageMonitorWin*>(
       GetWindowLongPtr(hwnd, GWLP_USERDATA));
   if (msg_wnd)
     return msg_wnd->WndProc(hwnd, message, wparam, lparam);
   return ::DefWindowProc(hwnd, message, wparam, lparam);
 }
 
+void StorageMonitorWin::OnMediaChanged(WPARAM wparam, LPARAM lparam) {

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

Move to after line 183

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

Done.

+  volume_mount_watcher_->OnMediaChanged(wparam, lparam);
+}
+
 LRESULT CALLBACK StorageMonitorWin::WndProc(HWND hwnd, UINT message,
                                             WPARAM wparam, LPARAM lparam) {
   switch (message) {
     case WM_DEVICECHANGE:
       OnDeviceChange(static_cast<UINT>(wparam), lparam);
       return TRUE;
+    case WM_USER_MEDIACHANGED:
+      OnMediaChanged(wparam, lparam);
+      return TRUE;
     default:
       break;
   }
 
   return ::DefWindowProc(hwnd, message, wparam, lparam);
 }
 
 bool StorageMonitorWin::GetDeviceInfo(const base::FilePath& device_path,
                                       StorageInfo* info) const {
   DCHECK(info);
 
   // TODO(kmadhusu) Implement PortableDeviceWatcherWin::GetDeviceInfo()
   // function when we have the functionality to add a sub directory of
   // portable device as a media gallery.
   return volume_mount_watcher_->GetDeviceInfo(device_path, info);
 }
 
 void StorageMonitorWin::OnDeviceChange(UINT event_type, LPARAM data) {
+  DVLOG(1) << "OnDeviceChange " << event_type << " " << data;
   volume_mount_watcher_->OnWindowMessage(event_type, data);
   portable_device_watcher_->OnWindowMessage(event_type, data);
 }
 
 StorageMonitor* StorageMonitor::CreateInternal() {
   return new StorageMonitorWin(new VolumeMountWatcherWin(),
                                new PortableDeviceWatcherWin());
 }
 
 }  // namespace storage_monitor