summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorkinaba@chromium.org <kinaba@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-23 03:04:01 +0000
committerkinaba@chromium.org <kinaba@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-23 03:04:01 +0000
commit3979df9a92bc1ec8a5325f37c11f43e5e7d635b2 (patch)
tree9c82a7e60a9d9c0c6b296b8d57d706bb3da61658 /chrome
parent398be98adf01da7d8a997b83c82be0d48ed81308 (diff)
downloadchromium_src-3979df9a92bc1ec8a5325f37c11f43e5e7d635b2.zip
chromium_src-3979df9a92bc1ec8a5325f37c11f43e5e7d635b2.tar.gz
chromium_src-3979df9a92bc1ec8a5325f37c11f43e5e7d635b2.tar.bz2
Files.app: Treat zip archives correctly as readonly.
The mounted zip archives volume info does not come as the "Disk" structure that represents a physical device-ish stuff. We should specially treat the archive case by inspecting the mount type, as we were doing in JS side before the regression in M33. BUG=336355 Review URL: https://codereview.chromium.org/132393006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@246499 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/chromeos/file_manager/volume_manager.cc3
-rw-r--r--chrome/test/data/extensions/api_test/file_browser/mount_test/test.js2
2 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/chromeos/file_manager/volume_manager.cc b/chrome/browser/chromeos/file_manager/volume_manager.cc
index a89c8703..390433a 100644
--- a/chrome/browser/chromeos/file_manager/volume_manager.cc
+++ b/chrome/browser/chromeos/file_manager/volume_manager.cc
@@ -129,7 +129,8 @@ VolumeInfo CreateVolumeInfoFromMountPointInfo(
} else {
volume_info.device_type = chromeos::DEVICE_TYPE_UNKNOWN;
volume_info.is_parent = false;
- volume_info.is_read_only = false;
+ volume_info.is_read_only =
+ (mount_point.mount_type == chromeos::MOUNT_TYPE_ARCHIVE);
}
volume_info.volume_id = GenerateVolumeId(volume_info);
diff --git a/chrome/test/data/extensions/api_test/file_browser/mount_test/test.js b/chrome/test/data/extensions/api_test/file_browser/mount_test/test.js
index cc63762..04a60ce 100644
--- a/chrome/test/data/extensions/api_test/file_browser/mount_test/test.js
+++ b/chrome/test/data/extensions/api_test/file_browser/mount_test/test.js
@@ -64,7 +64,7 @@ var expectedArchiveVolume = {
mountPath: '/archive/archive_mount_path',
sourcePath: 'archive_path',
volumeType: 'archive',
- isReadOnly: false,
+ isReadOnly: true,
profile: {displayName: "", isCurrentProfile: true}
};