Add a has_media flag to VolumeMetadata.

chrome/browser/chromeos/file_manager/volume_manager.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/file_manager/volume_manager.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
@@ skipping 114 matching lines @@
       drive::util::GetDriveMountPointPath(profile);
 
   VolumeInfo volume_info;
   volume_info.type = VOLUME_TYPE_GOOGLE_DRIVE;
   volume_info.device_type = chromeos::DEVICE_TYPE_UNKNOWN;
   volume_info.source_path = drive_path;
   volume_info.mount_path = drive_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;
 }
 
 VolumeInfo CreateDownloadsVolumeInfo(const base::FilePath& downloads_path) {
   VolumeInfo volume_info;
   volume_info.type = VOLUME_TYPE_DOWNLOADS_DIRECTORY;
   volume_info.device_type = chromeos::DEVICE_TYPE_UNKNOWN;
   // Keep source_path empty.
   volume_info.mount_path = 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;
 }
 
 VolumeInfo CreateTestingVolumeInfo(const base::FilePath& path,
                                    VolumeType volume_type,
                                    chromeos::DeviceType device_type) {
   VolumeInfo volume_info;
   volume_info.type = volume_type;
   volume_info.device_type = device_type;
   // Keep source_path empty.
   volume_info.mount_path = 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;
 }
 
 VolumeInfo CreateVolumeInfoFromMountPointInfo(
     const chromeos::disks::DiskMountManager::MountPointInfo& mount_point,
     const chromeos::disks::DiskMountManager::Disk* disk) {
   VolumeInfo volume_info;
   volume_info.type = MountTypeToVolumeType(mount_point.mount_type);
   volume_info.source_path = base::FilePath(mount_point.source_path);
   volume_info.mount_path = base::FilePath(mount_point.mount_path);
   volume_info.mount_condition = mount_point.mount_condition;
   volume_info.volume_label = volume_info.mount_path.BaseName().AsUTF8Unsafe();
   if (disk) {
     volume_info.device_type = disk->device_type();
     volume_info.system_path_prefix =
         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);
 
   return volume_info;
 }
 
 VolumeInfo CreateProvidedFileSystemVolumeInfo(
     const chromeos::file_system_provider::ProvidedFileSystemInfo&
         file_system_info) {
   VolumeInfo volume_info;
   volume_info.file_system_id = file_system_info.file_system_id();
   volume_info.extension_id = file_system_info.extension_id();
   volume_info.volume_label = file_system_info.display_name();
   volume_info.type = VOLUME_TYPE_PROVIDED;
   volume_info.mount_path = file_system_info.mount_path();
   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;
 }
 
 std::string GetMountPointNameForMediaStorage(
     const storage_monitor::StorageInfo& info) {
   std::string name(kFileManagerMTPMountNamePrefix);
   name += info.device_id();
   return name;
 }
 
 }  // namespace
 
 VolumeInfo::VolumeInfo()
     : type(VOLUME_TYPE_GOOGLE_DRIVE),
       device_type(chromeos::DEVICE_TYPE_UNKNOWN),
       mount_condition(chromeos::disks::MOUNT_CONDITION_NONE),
       is_parent(false),
       is_read_only(false) {

[mtomasz, 2014/10/29 00:50:42]

Please add has_media_(false).

[kenobi, 2014/10/29 14:56:33]

*facepalm* Amazing how quickly the c++-fu is evaporating from my brain.  Done.

 }
 
 VolumeInfo::~VolumeInfo() {
 }
 
 VolumeManager::VolumeManager(
     Profile* profile,
     drive::DriveIntegrationService* drive_integration_service,
     chromeos::PowerManagerClient* power_manager_client,
     chromeos::disks::DiskMountManager* disk_mount_manager,
@@ skipping 557 matching lines @@
     return;
   if (error_code == chromeos::MOUNT_ERROR_NONE)
     mounted_volumes_.erase(volume_info.volume_id);
 
   FOR_EACH_OBSERVER(VolumeManagerObserver,
                     observers_,
                     OnVolumeUnmounted(error_code, volume_info));
 }
 
 }  // namespace file_manager