| Index: chrome/browser/chromeos/file_manager/volume_manager.cc
|
| diff --git a/chrome/browser/chromeos/file_manager/volume_manager.cc b/chrome/browser/chromeos/file_manager/volume_manager.cc
|
| index 48bf7f75c0f075583811d26133ba83f3c7092cda..c8818e62b4ebcfce56b9d28462b52147df4b5b59 100644
|
| --- a/chrome/browser/chromeos/file_manager/volume_manager.cc
|
| +++ b/chrome/browser/chromeos/file_manager/volume_manager.cc
|
| @@ -132,6 +132,7 @@ VolumeInfo CreateDriveVolumeInfo(Profile* profile) {
|
| volume_info.mount_condition = chromeos::disks::MOUNT_CONDITION_NONE;
|
| volume_info.is_parent = false;
|
| volume_info.is_read_only = false;
|
| + volume_info.has_media = false;
|
| volume_info.volume_id = GenerateVolumeId(volume_info);
|
| return volume_info;
|
| }
|
| @@ -145,6 +146,7 @@ VolumeInfo CreateDownloadsVolumeInfo(const base::FilePath& downloads_path) {
|
| volume_info.mount_condition = chromeos::disks::MOUNT_CONDITION_NONE;
|
| volume_info.is_parent = false;
|
| volume_info.is_read_only = false;
|
| + volume_info.has_media = false;
|
| volume_info.volume_id = GenerateVolumeId(volume_info);
|
| return volume_info;
|
| }
|
| @@ -160,6 +162,7 @@ VolumeInfo CreateTestingVolumeInfo(const base::FilePath& path,
|
| volume_info.mount_condition = chromeos::disks::MOUNT_CONDITION_NONE;
|
| volume_info.is_parent = false;
|
| volume_info.is_read_only = false;
|
| + volume_info.has_media = false;
|
| volume_info.volume_id = GenerateVolumeId(volume_info);
|
| return volume_info;
|
| }
|
| @@ -179,11 +182,13 @@ VolumeInfo CreateVolumeInfoFromMountPointInfo(
|
| base::FilePath(disk->system_path_prefix());
|
| volume_info.is_parent = disk->is_parent();
|
| volume_info.is_read_only = disk->is_read_only();
|
| + volume_info.has_media = disk->has_media();
|
| } else {
|
| volume_info.device_type = chromeos::DEVICE_TYPE_UNKNOWN;
|
| volume_info.is_parent = false;
|
| volume_info.is_read_only =
|
| (mount_point.mount_type == chromeos::MOUNT_TYPE_ARCHIVE);
|
| + volume_info.has_media = false;
|
| }
|
| volume_info.volume_id = GenerateVolumeId(volume_info);
|
|
|
| @@ -202,6 +207,7 @@ VolumeInfo CreateProvidedFileSystemVolumeInfo(
|
| volume_info.mount_condition = chromeos::disks::MOUNT_CONDITION_NONE;
|
| volume_info.is_parent = true;
|
| volume_info.is_read_only = !file_system_info.writable();
|
| + volume_info.has_media = false;
|
| volume_info.volume_id = GenerateVolumeId(volume_info);
|
| return volume_info;
|
| }
|
| @@ -220,7 +226,8 @@ VolumeInfo::VolumeInfo()
|
| device_type(chromeos::DEVICE_TYPE_UNKNOWN),
|
| mount_condition(chromeos::disks::MOUNT_CONDITION_NONE),
|
| is_parent(false),
|
| - is_read_only(false) {
|
| + is_read_only(false),
|
| + has_media(false) {
|
| }
|
|
|
| VolumeInfo::~VolumeInfo() {
|
|
|