| Index: chrome/browser/media_gallery/media_galleries_dialog_controller.h
|
| diff --git a/chrome/browser/media_gallery/media_galleries_dialog_controller.h b/chrome/browser/media_gallery/media_galleries_dialog_controller.h
|
| index 166693e5a429614976bab6a67c25d8190452508d..cf781fa9dcafdf1b06aceefb11db44115a06d34d 100644
|
| --- a/chrome/browser/media_gallery/media_galleries_dialog_controller.h
|
| +++ b/chrome/browser/media_gallery/media_galleries_dialog_controller.h
|
| @@ -11,8 +11,8 @@
|
| #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/base/dialogs/select_file_dialog.h"
|
| #include "ui/gfx/native_widget_types.h"
|
|
|
| @@ -49,7 +49,7 @@ class MediaGalleriesDialog {
|
| // the dialog and owns itself.
|
| class MediaGalleriesDialogController
|
| : public ui::SelectFileDialog::Listener,
|
| - public base::SystemMonitor::DevicesChangedObserver {
|
| + public RemovableStorageObserver {
|
| public:
|
| // A fancy pair.
|
| struct GalleryPermission {
|
| @@ -101,12 +101,11 @@ class MediaGalleriesDialogController
|
| 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();
|
|
|