Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(579)

Unified Diff: chrome/browser/chromeos/file_manager/volume_manager.cc

Issue 677413007: Add a has_media flag to VolumeMetadata. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix has_media flags on unittest. Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..ca2ce197361b1e1a965139aa5b0ff0ffb6de160a 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;
}
« no previous file with comments | « chrome/browser/chromeos/file_manager/volume_manager.h ('k') | chrome/common/extensions/api/file_manager_private.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698