Allow to pass remount option to Mount method of cros_disks_client.

chromeos/dbus/cros_disks_client.h

 // Copyright (c) 2012 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.
 
 #ifndef CHROMEOS_DBUS_CROS_DISKS_CLIENT_H_
 #define CHROMEOS_DBUS_CROS_DISKS_CLIENT_H_
 
 #include <stdint.h>
 
 #include <string>
@@ skipping 90 matching lines @@
   UNMOUNT_OPTIONS_NONE,
   UNMOUNT_OPTIONS_LAZY,  // Do lazy unmount.
 };
 
 // Mount option to control write permission to a device.
 enum MountAccessMode {
   MOUNT_ACCESS_MODE_READ_WRITE,
   MOUNT_ACCESS_MODE_READ_ONLY,
 };
 
+// Whether to mount to a new path or remount a device already mounted.
+enum RemountOption {
+  // Mount a new device. If the device is already mounted, the mount status is
+  // unchanged and the callback for MountCompleted will receive
+  // MOUNT_ERROR_PATH_ALREADY_MOUNTED error code.
+  REMOUNT_OPTION_DISABLED,
+  // Remount a device that is already mounted. If the device is not mounted
+  // yet, it will do nothing and the callback for MountCompleted will receive
+  // MOUNT_ERROR_PATH_ALREADY_MOUNTED error code.

[hashimoto, 2016/10/19 12:15:27]

Receiving MOUNT_ERROR_PATH_ALREADY_MOUNTED when not mounted sounds weird.
Isn't this MOUNT_ERROR_PATH_NOT_MOUNTED?

[yamaguchi, 2016/10/19 12:27:21]

It was a simple mistake of the comment. Thanks.

+  REMOUNT_OPTION_ENABLED,
+};
+
 // A class to represent information about a disk sent from cros-disks.
 class CHROMEOS_EXPORT DiskInfo {
  public:
   DiskInfo(const std::string& device_path, dbus::Response* response);
   ~DiskInfo();
 
   // Device path. (e.g. /sys/devices/pci0000:00/.../8:0:0:0/block/sdb/sdb1)
   const std::string& device_path() const { return device_path_; }
 
   // Disk mount path. (e.g. /media/removable/VOLUME)
@@ skipping 150 matching lines @@
   // - The |source_format| argument passes the file extension (with the leading
   //   dot, for example ".zip"). If |source_format| is empty then the source
   //   format is auto-detected.
   // - The |mount_label| argument passes an optional mount label to be used as
   //   the directory name of the mount point. If |mount_label| is empty, the
   //   mount label will be based on the |source_path|.
   virtual void Mount(const std::string& source_path,
                      const std::string& source_format,
                      const std::string& mount_label,
                      MountAccessMode access_mode,
+                     RemountOption remount,
                      const base::Closure& callback,
                      const base::Closure& error_callback) = 0;
 
   // Calls Unmount method.  |callback| is called after the method call succeeds,
   // otherwise, |error_callback| is called.
   virtual void Unmount(const std::string& device_path,
                        UnmountOptions options,
                        const base::Closure& callback,
                        const base::Closure& error_callback) = 0;
 
@@ skipping 43 matching lines @@
 
   // Returns the path of the mount point for archive files.
   static base::FilePath GetArchiveMountPoint();
 
   // Returns the path of the mount point for removable disks.
   static base::FilePath GetRemovableDiskMountPoint();
 
   // Composes a list of mount options.
   static std::vector<std::string> ComposeMountOptions(
       const std::string& mount_label,
-      MountAccessMode access_mode);
+      MountAccessMode access_mode,
+      RemountOption remount);
 
  protected:
   // Create() should be used instead.
   CrosDisksClient();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(CrosDisksClient);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_DBUS_CROS_DISKS_CLIENT_H_