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

chrome/browser/media_gallery/media_galleries_dialog_controller.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_MEDIA_GALLERY_MEDIA_GALLERIES_DIALOG_CONTROLLER_H_
 #define CHROME_BROWSER_MEDIA_GALLERY_MEDIA_GALLERIES_DIALOG_CONTROLLER_H_
 
 #include <list>
 #include <map>
 
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string16.h"
-#include "base/system_monitor/system_monitor.h"
 #include "chrome/browser/media_gallery/media_galleries_preferences.h"
+#include "chrome/browser/system_monitor/removable_storage_observer.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/shell_dialogs/select_file_dialog.h"
 
 namespace content {
 class WebContents;
 }
 
 namespace extensions {
 class Extension;
 }
@@ skipping 16 matching lines @@
   // Constructs a platform-specific dialog owned and controlled by |controller|.
   static MediaGalleriesDialog* Create(
       MediaGalleriesDialogController* controller);
 };
 
 // The controller is responsible for handling the logic of the dialog and
 // interfacing with the model (i.e., MediaGalleriesPreferences). It shows
 // the dialog and owns itself.
 class MediaGalleriesDialogController
     : public ui::SelectFileDialog::Listener,
-      public base::SystemMonitor::DevicesChangedObserver {
+      public RemovableStorageObserver {
  public:
   // A fancy pair.
   struct GalleryPermission {
     GalleryPermission(const MediaGalleryPrefInfo& pref_info, bool allowed)
         : pref_info(pref_info), allowed(allowed) {}
     GalleryPermission() {}
 
     MediaGalleryPrefInfo pref_info;
     bool allowed;
   };
@@ skipping 31 matching lines @@
   // button, but have not yet been committed to the prefs system and will be
   // forgotten if the user Cancels. Since they don't have IDs assigned yet, it's
   // just a list and not a map.
   typedef std::list<GalleryPermission> NewGalleryPermissions;
 
   // SelectFileDialog::Listener implementation:
   virtual void FileSelected(const FilePath& path,
                             int index,
                             void* params) OVERRIDE;
 
-  // base::SystemMonitor::DevicesChangedObserver implementation:
+  // RemovableStorageObserver implementation:
   virtual void OnRemovableStorageAttached(
-      const std::string& id,
-      const string16& name,
-      const FilePath::StringType& location) OVERRIDE;
-  virtual void OnRemovableStorageDetached(const std::string& id) OVERRIDE;
+      const RemovableStorageNotifications::StorageInfo& info) OVERRIDE;
+  virtual void OnRemovableStorageDetached(
+      const RemovableStorageNotifications::StorageInfo& info) OVERRIDE;
 
   // Populates |known_galleries_|.
   void InitializePermissions();
 
   // Saves state of |known_galleries_| and |new_galleries_| to model.
   void SavePermissions();
 
   // Update the model and view when a device is attached or detached.
   void UpdateGalleryOnDeviceEvent(const std::string& device_id, bool attached);
 
@@ skipping 19 matching lines @@
   scoped_ptr<MediaGalleriesDialog> dialog_;
 
   scoped_refptr<ui::SelectFileDialog> select_folder_dialog_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaGalleriesDialogController);
 };
 
 }  // namespace chrome
 
 #endif  // CHROME_BROWSER_MEDIA_GALLERY_MEDIA_GALLERIES_DIALOG_CONTROLLER_H_