Adding support for mount point different from removable devices to MountLibrary

chrome/browser/chromeos/cros/mount_library.h

 // Copyright (c) 2011 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 CHROME_BROWSER_CHROMEOS_CROS_MOUNT_LIBRARY_H_
 #define CHROME_BROWSER_CHROMEOS_CROS_MOUNT_LIBRARY_H_
 #pragma once
 
+#include <map>
 #include <string>
-#include <map>
 
 #include "base/memory/singleton.h"
 #include "base/observer_list.h"
 #include "base/time.h"
 #include "third_party/cros/chromeos_mount.h"
 
 namespace chromeos {
 
 typedef enum MountLibraryEventType {
   MOUNT_DISK_ADDED,
   MOUNT_DISK_REMOVED,
   MOUNT_DISK_CHANGED,
   MOUNT_DISK_MOUNTED,
   MOUNT_DISK_UNMOUNTED,
   MOUNT_DEVICE_ADDED,
   MOUNT_DEVICE_REMOVED,
   MOUNT_DEVICE_SCANNED
 } MountLibraryEventType;
 
 // This class handles the interaction with the ChromeOS mount library APIs.
 // Classes can add themselves as observers. Users can get an instance of this
 // library class like this: chromeos::CrosLibrary::Get()->GetMountLibrary()
 class MountLibrary {
  public:
+  enum MountEvent {
+    MOUNTING,
+    UNMOUNTING
+  };
   // Used to house an instance of each found mount device.
   class Disk {
    public:
     Disk(const std::string& device_path,
          const std::string& mount_path,
          const std::string& system_path,
          const std::string& file_path,
          const std::string& device_label,
          const std::string& drive_label,
          const std::string& parent_path,
@@ skipping 45 matching lines @@
     std::string parent_path_;
     DeviceType device_type_;
     uint64 total_size_;
     bool is_parent_;
     bool is_read_only_;
     bool has_media_;
     bool on_boot_device_;
   };
   typedef std::map<std::string, Disk*> DiskMap;
 
+  // MountPointInfo: {mount_path, mount_type}.
+  struct MountPointInfo {
+    std::string source_path;
+    std::string mount_path;
+    MountType mount_type;
+
+    MountPointInfo(const char* source, const char* mount, const MountType type)
+        : source_path(source ? source : ""),
+          mount_path(mount ? mount : ""),
+          mount_type(type) {
+    }
+  };
+
+  // MountPointMap key is source_path.
+  typedef std::map<std::string, MountPointInfo> MountPointMap;
+
   typedef void(*UnmountDeviceRecursiveCallbackType)(void*, bool);
 
   class Observer {
    public:
     virtual ~Observer() {}
     // Async API events.
     virtual void DiskChanged(MountLibraryEventType event,
                              const Disk* disk) = 0;
     virtual void DeviceChanged(MountLibraryEventType event,
                                const std::string& device_path ) = 0;
+    virtual void MountCompleted(MountEvent event_type,
+        MountError error_code,
+        const MountPointInfo& mount_info) = 0;
   };
 
   virtual ~MountLibrary() {}
   virtual void AddObserver(Observer* observer) = 0;
   virtual void RemoveObserver(Observer* observer) = 0;
   virtual const DiskMap& disks() const = 0;
+  virtual const MountPointMap& mount_points() const = 0;
+
+  virtual std::string MountTypeToString(MountType type) const = 0;
+  virtual MountType MountTypeFromString(const std::string& type_str) const = 0;
 
   virtual void RequestMountInfoRefresh() = 0;
-  virtual void MountPath(const char* device_path) = 0;
-  virtual void UnmountPath(const char* device_path) = 0;
+  virtual void MountPath(const char* source_path,
+                         MountType type,
+                         const MountPathOptions& options) = 0;
+  // |path| may be source od mount path.
+  virtual void UnmountPath(const char* path) = 0;
 
   // Unmounts device_poath and all of its known children.
   virtual void UnmountDeviceRecursive(const char* device_path,
       UnmountDeviceRecursiveCallbackType callback, void* user_data) = 0;
 
   // Factory function, creates a new instance and returns ownership.
   // For normal usage, access the singleton via CrosLibrary::Get().
   static MountLibrary* GetImpl(bool stub);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_CROS_MOUNT_LIBRARY_H_