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

Unified Diff: chrome/browser/chromeos/extensions/file_browser_event_router.cc

Issue 7706028: This is UI side unreadable device support. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: merging conflict Created 9 years, 4 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/extensions/file_browser_event_router.cc
diff --git a/chrome/browser/chromeos/extensions/file_browser_event_router.cc b/chrome/browser/chromeos/extensions/file_browser_event_router.cc
index 5c0fc9954d8f42ccc44958b13d7bc27cdd1256d7..aa01068c2971f486be0e53f441d34676b7665719 100644
--- a/chrome/browser/chromeos/extensions/file_browser_event_router.cc
+++ b/chrome/browser/chromeos/extensions/file_browser_event_router.cc
@@ -344,16 +344,10 @@ void ExtensionFileBrowserEventRouter::DispatchMountCompletedEvent(
FilePath relative_mount_path;
bool relative_mount_path_set = false;
- // If the device is corrupted but it's still possible to format it, it will
- // be fake mounted.
- // TODO(sidor): Write more general condition when it will possible.
- bool mount_corrupted_device =
- (error_code == chromeos::MOUNT_ERROR_UNKNOWN_FILESYSTEM ||
- error_code == chromeos::MOUNT_ERROR_UNSUPORTED_FILESYSTEM) &&
- mount_info.mount_type == chromeos::MOUNT_TYPE_DEVICE;
-
- // If there were no error, add mountPath to the event.
- if (error_code == chromeos::MOUNT_ERROR_NONE || mount_corrupted_device) {
+ // If there were no error or some special conditions occured, add mountPath
+ // to the event.
+ if (error_code == chromeos::MOUNT_ERROR_NONE ||
+ mount_info.mount_condition) {
// Convert mount point path to relative path with the external file system
// exposed within File API.
if (FileManagerUtil::ConvertFileToRelativeFileSystemPath(profile_,
@@ -373,7 +367,7 @@ void ExtensionFileBrowserEventRouter::DispatchMountCompletedEvent(
if (relative_mount_path_set &&
mount_info.mount_type == chromeos::MOUNT_TYPE_DEVICE &&
- !mount_corrupted_device && // User should not be bothered by that.
+ !mount_info.mount_condition &&
event == chromeos::MountLibrary::MOUNTING) {
FileManagerUtil::ShowFullTabUrl(profile_, FilePath(mount_info.mount_path));
}
« no previous file with comments | « chrome/browser/chromeos/cros/mount_library.cc ('k') | chrome/browser/extensions/extension_file_browser_private_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698