Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / chromeos / file_manager / volume_manager.h

diff --git a/src/chrome/browser/chromeos/file_manager/volume_manager.h b/src/chrome/browser/chromeos/file_manager/volume_manager.h
index da1f013..0c55b5f 100644 (file)
--- a/src/chrome/browser/chromeos/file_manager/volume_manager.h
+++ b/src/chrome/browser/chromeos/file_manager/volume_manager.h
@@ -107,6 +107,9 @@ struct VolumeInfo {
 
   // True if the volume is read only.
   bool is_read_only;
+
+  // True if the volume contains media.
+  bool has_media;
 };
 
 // Manages "Volume"s for file manager. Here are "Volume"s.
@@ -136,7 +139,7 @@ class VolumeManager : public KeyedService,
   void Initialize();
 
   // Disposes this instance.
-  virtual void Shutdown() OVERRIDE;
+  virtual void Shutdown() override;
 
   // Adds an observer.
   void AddObserver(VolumeManagerObserver* observer);
@@ -163,44 +166,44 @@ class VolumeManager : public KeyedService,
                                chromeos::DeviceType device_type);
 
   // drive::DriveIntegrationServiceObserver overrides.
-  virtual void OnFileSystemMounted() OVERRIDE;
-  virtual void OnFileSystemBeingUnmounted() OVERRIDE;
+  virtual void OnFileSystemMounted() override;
+  virtual void OnFileSystemBeingUnmounted() override;
 
   // chromeos::disks::DiskMountManager::Observer overrides.
   virtual void OnDiskEvent(
       chromeos::disks::DiskMountManager::DiskEvent event,
-      const chromeos::disks::DiskMountManager::Disk* disk) OVERRIDE;
+      const chromeos::disks::DiskMountManager::Disk* disk) override;
   virtual void OnDeviceEvent(
       chromeos::disks::DiskMountManager::DeviceEvent event,
-      const std::string& device_path) OVERRIDE;
+      const std::string& device_path) override;
   virtual void OnMountEvent(
       chromeos::disks::DiskMountManager::MountEvent event,
       chromeos::MountError error_code,
       const chromeos::disks::DiskMountManager::MountPointInfo& mount_info)
-      OVERRIDE;
+      override;
   virtual void OnFormatEvent(
       chromeos::disks::DiskMountManager::FormatEvent event,
       chromeos::FormatError error_code,
-      const std::string& device_path) OVERRIDE;
+      const std::string& device_path) override;
 
   // chromeos::file_system_provider::Observer overrides.
   virtual void OnProvidedFileSystemMount(
       const chromeos::file_system_provider::ProvidedFileSystemInfo&
           file_system_info,
-      base::File::Error error) OVERRIDE;
+      base::File::Error error) override;
   virtual void OnProvidedFileSystemUnmount(
       const chromeos::file_system_provider::ProvidedFileSystemInfo&
           file_system_info,
-      base::File::Error error) OVERRIDE;
+      base::File::Error error) override;
 
   // Called on change to kExternalStorageDisabled pref.
   void OnExternalStorageDisabledChanged();
 
   // RemovableStorageObserver overrides.
   virtual void OnRemovableStorageAttached(
-      const storage_monitor::StorageInfo& info) OVERRIDE;
+      const storage_monitor::StorageInfo& info) override;
   virtual void OnRemovableStorageDetached(
-      const storage_monitor::StorageInfo& info) OVERRIDE;
+      const storage_monitor::StorageInfo& info) override;
 
   SnapshotManager* snapshot_manager() { return snapshot_manager_.get(); }