| Index: chrome/browser/intents/device_attached_intent_source.h
|
| diff --git a/chrome/browser/intents/device_attached_intent_source.h b/chrome/browser/intents/device_attached_intent_source.h
|
| index fa9b925877ddf57bd634928fdf0a7ced0a89cc8b..901f2c7c1bf001242cab10056d2c8a779c54180d 100644
|
| --- a/chrome/browser/intents/device_attached_intent_source.h
|
| +++ b/chrome/browser/intents/device_attached_intent_source.h
|
| @@ -9,7 +9,7 @@
|
| #include <string>
|
|
|
| #include "base/memory/weak_ptr.h"
|
| -#include "base/system_monitor/system_monitor.h"
|
| +#include "chrome/browser/system_monitor/removable_storage_notifications.h"
|
|
|
| class Browser;
|
|
|
| @@ -25,14 +25,14 @@ class WebContentsDelegate;
|
| // root_path = the File Path at which the device is accessible
|
| // filesystem_id = registered isolated file system identifier
|
| class DeviceAttachedIntentSource
|
| - : public base::SystemMonitor::DevicesChangedObserver,
|
| + : public chrome::RemovableStorageNotifications::RemovableStorageObserver,
|
| public base::SupportsWeakPtr<DeviceAttachedIntentSource> {
|
| public:
|
| DeviceAttachedIntentSource(Browser* browser,
|
| content::WebContentsDelegate* delegate);
|
| virtual ~DeviceAttachedIntentSource();
|
|
|
| - // base::SystemMonitor::DevicesChangedObserver implementation.
|
| + // RemovableStorageObserver implementation.
|
| virtual void OnRemovableStorageAttached(
|
| const std::string& id,
|
| const string16& name,
|
| @@ -42,10 +42,12 @@ class DeviceAttachedIntentSource
|
| // Dispatches web intents for the attached media device specified by
|
| // |device_info|.
|
| void DispatchIntentsForService(
|
| - const base::SystemMonitor::RemovableStorageInfo& device_info);
|
| + const chrome::RemovableStorageNotifications::RemovableStorageInfo&
|
| + device_info);
|
|
|
| private:
|
| - typedef std::map<std::string, base::SystemMonitor::RemovableStorageInfo>
|
| + typedef std::map<std::string,
|
| + chrome::RemovableStorageNotifications::RemovableStorageInfo>
|
| DeviceIdToInfoMap;
|
|
|
| // Weak pointer to browser to which intents will be dispatched.
|
|
|