diff -r 000000000000 -r 6474c204b198 dom/system/gonk/Volume.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dom/system/gonk/Volume.h	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,120 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef mozilla_system_volume_h__
+#define mozilla_system_volume_h__
+
+#include "VolumeCommand.h"
+#include "nsIVolume.h"
+#include "nsString.h"
+#include "mozilla/Observer.h"
+#include "nsISupportsImpl.h"
+#include "nsWhitespaceTokenizer.h"
+
+namespace mozilla {
+namespace system {
+
+/***************************************************************************
+*
+*   There is an instance of the Volume class for each volume reported
+*   from vold.
+*
+*   Each volume originates from the /system/etv/vold.fstab file.
+*
+***************************************************************************/
+
+class Volume MOZ_FINAL
+{
+public:
+  NS_INLINE_DECL_REFCOUNTING(Volume)
+
+  Volume(const nsCSubstring& aVolumeName);
+
+  typedef long STATE; // States are now defined in nsIVolume.idl
+
+  static const char* StateStr(STATE aState) { return NS_VolumeStateStr(aState); }
+  const char* StateStr() const  { return StateStr(mState); }
+  STATE State() const           { return mState; }
+
+  const nsCString& Name() const { return mName; }
+  const char* NameStr() const   { return mName.get(); }
+
+  // The mount point is the name of the directory where the volume is mounted.
+  // (i.e. path that leads to the files stored on the volume).
+  const nsCString& MountPoint() const { return mMountPoint; }
+
+  int32_t MountGeneration() const     { return mMountGeneration; }
+  bool IsMountLocked() const          { return mMountLocked; }
+  bool MediaPresent() const           { return mMediaPresent; }
+  bool CanBeShared() const            { return mCanBeShared; }
+  bool CanBeFormatted() const         { return CanBeShared(); }
+  bool CanBeMounted() const           { return CanBeShared(); }
+  bool IsSharingEnabled() const       { return mCanBeShared && mSharingEnabled; }
+  bool IsFormatRequested() const      { return CanBeFormatted() && mFormatRequested; }
+  bool IsMountRequested() const       { return CanBeMounted() && mMountRequested; }
+  bool IsUnmountRequested() const     { return CanBeMounted() && mUnmountRequested; }
+  bool IsSharing() const              { return mIsSharing; }
+  bool IsFormatting() const           { return mIsFormatting; }
+
+  void SetSharingEnabled(bool aSharingEnabled);
+  void SetFormatRequested(bool aFormatRequested);
+  void SetMountRequested(bool aMountRequested);
+  void SetUnmountRequested(bool aUnmountRequested);
+
+  typedef mozilla::Observer<Volume *>     EventObserver;
+  typedef mozilla::ObserverList<Volume *> EventObserverList;
+
+  // NOTE: that observers must live in the IOThread.
+  static void RegisterObserver(EventObserver* aObserver);
+  static void UnregisterObserver(EventObserver* aObserver);
+
+private:
+  friend class AutoMounter;         // Calls StartXxx
+  friend class nsVolume;            // Calls UpdateMountLock
+  friend class VolumeManager;       // Calls HandleVoldResponse
+  friend class VolumeListCallback;  // Calls SetMountPoint, SetState
+
+  // The StartXxx functions will queue up a command to the VolumeManager.
+  // You can queue up as many commands as you like, and aCallback will
+  // be called as each one completes.
+  void StartMount(VolumeResponseCallback* aCallback);
+  void StartUnmount(VolumeResponseCallback* aCallback);
+  void StartFormat(VolumeResponseCallback* aCallback);
+  void StartShare(VolumeResponseCallback* aCallback);
+  void StartUnshare(VolumeResponseCallback* aCallback);
+
+  void SetIsSharing(bool aIsSharing);
+  void SetIsFormatting(bool aIsFormatting);
+  void SetState(STATE aNewState);
+  void SetMediaPresent(bool aMediaPresent);
+  void SetMountPoint(const nsCSubstring& aMountPoint);
+  void StartCommand(VolumeCommand* aCommand);
+
+  void HandleVoldResponse(int aResponseCode, nsCWhitespaceTokenizer& aTokenizer);
+
+  static void UpdateMountLock(const nsACString& aVolumeName,
+                              const int32_t& aMountGeneration,
+                              const bool& aMountLocked);
+
+  bool              mMediaPresent;
+  STATE             mState;
+  const nsCString   mName;
+  nsCString         mMountPoint;
+  int32_t           mMountGeneration;
+  bool              mMountLocked;
+  bool              mSharingEnabled;
+  bool              mFormatRequested;
+  bool              mMountRequested;
+  bool              mUnmountRequested;
+  bool              mCanBeShared;
+  bool              mIsSharing;
+  bool              mIsFormatting;
+
+  static EventObserverList mEventObserverList;
+};
+
+} // system
+} // mozilla
+
+#endif  // mozilla_system_volumemanager_h__