Add EnumerateMountEntries method in CrosDisksClient.

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 <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/callback_forward.h"
 #include "chromeos/chromeos_export.h"
 #include "chromeos/dbus/dbus_client.h"
 #include "chromeos/dbus/dbus_client_implementation_type.h"
 
 namespace base {
 class FilePath;
 }
 
 namespace dbus {
+class MessageReader;
 class Response;
 }
 
 // TODO(tbarzic): We should move these enums inside CrosDisksClient,
 // to be clearer where they come from. Also, most of these are partially or
 // completely duplicated in third_party/dbus/service_constants.h. We should
 // probably use enums from service_contstants directly.
 namespace chromeos {
 
 // Enum describing types of mount used by cros-disks.
@@ skipping 82 matching lines @@
   // Disk system path given by udev.
   // (e.g. /sys/devices/pci0000:00/.../8:0:0:0/block/sdb/sdb1)
   const std::string& system_path() const { return system_path_; }
 
   // Is a drive or not. (i.e. true with /dev/sdb, false with /dev/sdb1)
   bool is_drive() const { return is_drive_; }
 
   // Does the disk have media content.
   bool has_media() const { return has_media_; }
 
-  // Is the disk on deveice we booted the machine from.
+  // Is the disk on device we booted the machine from.
   bool on_boot_device() const { return on_boot_device_; }
 
   // Disk file path (e.g. /dev/sdb).
   const std::string& file_path() const { return file_path_; }
 
   // Disk label.
   const std::string& label() const { return label_; }
 
   // Vendor ID of the device (e.g. "18d1").
   const std::string& vendor_id() const { return vendor_id_; }
@@ skipping 42 matching lines @@
   std::string product_id_;
   std::string product_name_;
   std::string drive_model_;
   DeviceType device_type_;
   uint64 total_size_in_bytes_;
   bool is_read_only_;
   bool is_hidden_;
   std::string uuid_;
 };
 
+// A class to represent information about a mount point sent from cros-disks.
+class CHROMEOS_EXPORT MountEntry {

[stevenjb, 2014/05/14 17:45:11]

This could actually just be a struct since it doesn't contain any non-static
member functions. The constructors can be inlined.

[kinaba, 2014/05/15 02:14:59]

Done.

+ public:
+  MountEntry();
+  MountEntry(MountError error_code,
+             const std::string& source_path,
+             MountType mount_type,
+             const std::string& mount_path);
+  ~MountEntry();
+
+  static bool ReadFromDbus(dbus::MessageReader* reader, MountEntry* entry);
+
+  MountError error_code() const { return error_code_; }
+  const std::string& source_path() const { return source_path_; }
+  MountType mount_type() const { return mount_type_; }
+  const std::string& mount_path() const { return mount_path_; }
+
+ private:
+  MountError error_code_;
+  std::string source_path_;
+  MountType mount_type_;
+  std::string mount_path_;
+};
+
 // A class to make the actual DBus calls for cros-disks service.
 // This class only makes calls, result/error handling should be done
 // by callbacks.
 class CHROMEOS_EXPORT CrosDisksClient : public DBusClient {
  public:
   // A callback to handle the result of EnumerateAutoMountableDevices.
   // The argument is the enumerated device paths.
   typedef base::Callback<void(const std::vector<std::string>& device_paths)>
       EnumerateAutoMountableDevicesCallback;
 
+  // A callback to handle the result of EnumerateMountEntries.
+  // The argument is the enumerated mount entries.
+  typedef base::Callback<void(const std::vector<MountEntry>& entries)>
+      EnumerateMountEntriesCallback;
+
   // A callback to handle the result of GetDeviceProperties.
   // The argument is the information about the specified device.
   typedef base::Callback<void(const DiskInfo& disk_info)>
       GetDevicePropertiesCallback;
 
   // A callback to handle MountCompleted signal.
-  // The first argument is the error code.
-  // The second argument is the source path.
-  // The third argument is the mount type.
-  // The fourth argument is the mount path.
-  typedef base::Callback<void(MountError error_code,
-                              const std::string& source_path,
-                              MountType mount_type,
-                              const std::string& mount_path)>
-      MountCompletedHandler;
+  typedef base::Callback<void(const MountEntry& entry)> MountCompletedHandler;
 
   // A callback to handle FormatCompleted signal.
   // The first argument is the error code.
   // The second argument is the device path.
   typedef base::Callback<void(FormatError error_code,
                               const std::string& device_path)>
       FormatCompletedHandler;
 
   // A callback to handle mount events.
   // The first argument is the event type.
@@ skipping 25 matching lines @@
                        UnmountOptions options,
                        const base::Closure& callback,
                        const base::Closure& error_callback) = 0;
 
   // Calls EnumerateAutoMountableDevices method.  |callback| is called after the
   // method call succeeds, otherwise, |error_callback| is called.
   virtual void EnumerateAutoMountableDevices(
       const EnumerateAutoMountableDevicesCallback& callback,
       const base::Closure& error_callback) = 0;
 
+  // Calls EnumerateMountEntries.  |callback| is called after the
+  // method call succeeds, otherwise, |error_callback| is called.
+  virtual void EnumerateMountEntries(
+      const EnumerateMountEntriesCallback& callback,
+      const base::Closure& error_callback) = 0;
+
   // Calls Format method.  |callback| is called after the method call succeeds,
   // otherwise, |error_callback| is called.
   virtual void Format(const std::string& device_path,
                       const std::string& filesystem,
                       const base::Closure& callback,
                       const base::Closure& error_callback) = 0;
 
   // Calls GetDeviceProperties method.  |callback| is called after the method
   // call succeeds, otherwise, |error_callback| is called.
   virtual void GetDeviceProperties(const std::string& device_path,
@@ skipping 29 matching lines @@
   // Create() should be used instead.
   CrosDisksClient();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(CrosDisksClient);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_DBUS_CROS_DISKS_CLIENT_H_