Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / chromeos / extensions / file_manager / private_api_util.cc

diff --git a/src/chrome/browser/chromeos/extensions/file_manager/private_api_util.cc b/src/chrome/browser/chromeos/extensions/file_manager/private_api_util.cc
index a97f16d..229d6ec 100644 (file)
--- a/src/chrome/browser/chromeos/extensions/file_manager/private_api_util.cc
+++ b/src/chrome/browser/chromeos/extensions/file_manager/private_api_util.cc
@@ -119,7 +119,10 @@ void GetSelectedFileInfoInternal(Profile* profile,
       // MTP, or provided file system), we should resolve the path.
       switch (params->local_path_option) {
         case NO_LOCAL_PATH_RESOLUTION:
-          break;  // No special handling needed.
+          // Pass empty local path.
+          params->selected_files.push_back(
+              ui::SelectedFileInfo(file_path, base::FilePath()));
+          break;
         case NEED_LOCAL_PATH_FOR_OPENING:
           GetFileNativeLocalPathForOpening(
               profile,
@@ -137,9 +140,10 @@ void GetSelectedFileInfoInternal(Profile* profile,
                          base::Passed(&params)));
           return;  // Remaining work is done in ContinueGetSelectedFileInfo.
       }
+    } else {
+      params->selected_files.push_back(
+          ui::SelectedFileInfo(file_path, file_path));
     }
-    params->selected_files.push_back(
-        ui::SelectedFileInfo(file_path, base::FilePath()));
   }
   params->callback.Run(params->selected_files);
 }
@@ -256,6 +260,7 @@ void VolumeInfoToVolumeMetadata(
   }
 
   volume_metadata->is_read_only = volume_info.is_read_only;
+  volume_metadata->has_media = volume_info.has_media;
 
   switch (volume_info.mount_condition) {
     case chromeos::disks::MOUNT_CONDITION_NONE: