| Index: chrome/browser/chromeos/file_manager/volume_manager.h
|
| diff --git a/chrome/browser/chromeos/file_manager/volume_manager.h b/chrome/browser/chromeos/file_manager/volume_manager.h
|
| index 81166f4f5def4c297f7c3cd2bf796e4daa2a6d5d..204db92c20b58b6e7f460f084303fc1d5742e3ff 100644
|
| --- a/chrome/browser/chromeos/file_manager/volume_manager.h
|
| +++ b/chrome/browser/chromeos/file_manager/volume_manager.h
|
| @@ -19,6 +19,7 @@
|
| #include "base/observer_list.h"
|
| #include "base/prefs/pref_change_registrar.h"
|
| #include "chrome/browser/chromeos/drive/drive_integration_service.h"
|
| +#include "chrome/browser/chromeos/file_system_provider/file_system_plugin/plugin_service.h"
|
| #include "chrome/browser/chromeos/file_system_provider/observer.h"
|
| #include "chrome/browser/chromeos/file_system_provider/service.h"
|
| #include "chromeos/dbus/cros_disks_client.h"
|
| @@ -56,6 +57,7 @@ enum VolumeType {
|
| // tools/metrics/histograms/histograms.xml. Since enums for histograms are
|
| // append-only (for keeping the number consistent across versions), new values
|
| // for this enum also has to be always appended at the end (i.e., here).
|
| + VOLUME_TYPE_PLUGIN_PROVIDED,
|
| NUM_VOLUME_TYPE,
|
| };
|
|
|
| @@ -209,6 +211,8 @@ class VolumeManager : public KeyedService,
|
| chromeos::PowerManagerClient* power_manager_client,
|
| chromeos::disks::DiskMountManager* disk_mount_manager,
|
| chromeos::file_system_provider::Service* file_system_provider_service,
|
| + chromeos::file_system_provider::PluginService*
|
| + file_system_plugin_provided_service,
|
| GetMtpStorageInfoCallback get_mtp_storage_info_callback);
|
| ~VolumeManager() override;
|
|
|
| @@ -305,6 +309,8 @@ class VolumeManager : public KeyedService,
|
| base::ObserverList<VolumeManagerObserver> observers_;
|
| chromeos::file_system_provider::Service*
|
| file_system_provider_service_; // Not owned by this class.
|
| + chromeos::file_system_provider::PluginService*
|
| + file_system_plugin_provided_service_;
|
| GetMtpStorageInfoCallback get_mtp_storage_info_callback_;
|
| std::map<std::string, linked_ptr<Volume>> mounted_volumes_;
|
| scoped_ptr<SnapshotManager> snapshot_manager_;
|
|
|