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

components/storage_monitor/storage_monitor_win.h

 // 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.
 
 #ifndef COMPONENTS_STORAGE_MONITOR_STORAGE_MONITOR_WIN_H_
 #define COMPONENTS_STORAGE_MONITOR_STORAGE_MONITOR_WIN_H_
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 32 matching lines @@
       base::string16* storage_object_id) const OVERRIDE;
 
   virtual void EjectDevice(
       const std::string& device_id,
       base::Callback<void(EjectStatus)> callback) OVERRIDE;
 
  private:
   class PortableDeviceNotifications;
   friend class TestStorageMonitorWin;
 
+  void MediaChangeNotificationRegister();
+
   // Gets the removable storage information given a |device_path|. On success,
   // returns true and fills in |info|.
   bool GetDeviceInfo(const base::FilePath& device_path,
                      StorageInfo* info) const;
 
   static LRESULT CALLBACK WndProcThunk(HWND hwnd, UINT message, WPARAM wparam,
                                        LPARAM lparam);
 
   LRESULT CALLBACK WndProc(HWND hwnd, UINT message, WPARAM wparam,
                            LPARAM lparam);
 
   void OnDeviceChange(UINT event_type, LPARAM data);
+  void OnMediaChange(WPARAM wparam, LPARAM lparam);
 
   // The window class of |window_|.
   ATOM window_class_;
 
   // The handle of the module that contains the window procedure of |window_|.
   HMODULE instance_;
   HWND window_;
 
+  // The handle of a registration for shell notifications.
+  ULONG registration_handle_;

[vandebo (ex-Chrome), 2014/04/23 16:34:35]

This could have a more descriptive name

[Kevin Bailey, 2014/04/23 18:06:14]

|notification_registration_handle_| ? I use "handle" because different versions
of the SDK call it different things, one of which is a handle.

Would it help to say more in the comment ?
"This is returned by ...Register and must be passed to ...Deregister."

[vandebo (ex-Chrome), 2014/04/23 18:09:27]

There's lots of things that are registered... shell_change_notify_handle_ ?

[rvargas (doing something else), 2014/04/23 18:45:15]

Given that this is not really a handle, shell_change_notify_id_ seems better.

[Kevin Bailey, 2014/04/24 15:12:38]

Done.

+
   // The volume mount point watcher, used to manage the mounted devices.
   scoped_ptr<VolumeMountWatcherWin> volume_mount_watcher_;
 
   // The portable device watcher, used to manage media transfer protocol
   // devices.
   scoped_ptr<PortableDeviceWatcherWin> portable_device_watcher_;
 
   DISALLOW_COPY_AND_ASSIGN(StorageMonitorWin);
 };
 
 }  // namespace storage_monitor
 
 #endif  // COMPONENTS_STORAGE_MONITOR_STORAGE_MONITOR_WIN_H_