[Media Galleries] Move RemovableStorageInfo notifications to chrome namespace (part 2)

chrome/browser/system_monitor/volume_mount_watcher_win.h

 // 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.
 
 #ifndef CHROME_BROWSER_SYSTEM_MONITOR_VOLUME_MOUNT_WATCHER_WIN_H_
 #define CHROME_BROWSER_SYSTEM_MONITOR_VOLUME_MOUNT_WATCHER_WIN_H_
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/string16.h"
-#include "base/system_monitor/system_monitor.h"
 
 namespace chrome {
 
 // This class watches the volume mount points and sends notifications to
-// base::SystemMonitor about the device attach/detach events. This is a
-// singleton class instantiated by RemovableDeviceNotificationsWindowWin.
+// RemovableStorageNotifications about the device attach/detach events.
+// This is a singleton class instantiated by
+// RemovableDeviceNotificationsWindowWin.
 class VolumeMountWatcherWin
     : public base::RefCountedThreadSafe<VolumeMountWatcherWin> {
  public:
+  // TODO(gbillock): Take the RemovableStorageNotifications as an argument.

[vandebo (ex-Chrome), 2013/01/18 18:42:58]

This is so that you could call ProcessAttach/Detach ?  I don't think that will
work.  I think you need to take an inner class of
RemovableDeviceNotificationsWindowWin that makes that functionality available
here and to PortableDeviceWatcherWin.  The TODO is fine as long as we agree on
what it really means.

[Greg Billock, 2013/01/22 20:00:39]

Yes, that's the goal -- basically the platform-specific impl should expose some
kind of interface it needs to relate to its tooling classes. The main thing is
to make the ownership tree simple and reduce (ideally to zero) singleton
references.

   VolumeMountWatcherWin();
 
   // Must be called after the file thread is created.
   void Init();
 
   // Gets the information about the device mounted at |device_path|. On success,
   // returns true and fills in |location|, |unique_id|, |name|, and |removable|.
   virtual bool GetDeviceInfo(const FilePath& device_path,
                              string16* location,
                              std::string* unique_id,
                              string16* name,
                              bool* removable);
 
-  // Processes DEV_BROADCAST_VOLUME messages and triggers a SystemMonitor
+  // Processes DEV_BROADCAST_VOLUME messages and triggers a
   // notification if appropriate.
   void OnWindowMessage(UINT event_type, LPARAM data);
 
  protected:
   // VolumeMountWatcherWin is ref-counted.
   virtual ~VolumeMountWatcherWin();
 
   // Returns a vector of all the removable mass storage devices that are
   // connected.
   virtual std::vector<FilePath> GetAttachedDevices();
@@ skipping 31 matching lines @@
   // A map from device mount point to device metadata. Only accessed on the UI
   // thread.
   MountPointDeviceMetadataMap device_metadata_;
 
   DISALLOW_COPY_AND_ASSIGN(VolumeMountWatcherWin);
 };
 
 }  // namespace chrome
 
 #endif  // CHROME_BROWSER_SYSTEM_MONITOR_VOLUME_MOUNT_WATCHER_WIN_H_