diff -r 000000000000 -r 6474c204b198 dom/voicemail/Voicemail.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dom/voicemail/Voicemail.h	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,85 @@
+/* -*- Mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; tab-width: 40 -*- */
+/* vim: set ts=2 et sw=2 tw=40: */
+/* 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_dom_voicemail_voicemail_h__
+#define mozilla_dom_voicemail_voicemail_h__
+
+#include "mozilla/Attributes.h"
+#include "mozilla/DOMEventTargetHelper.h"
+#include "mozilla/ErrorResult.h"
+#include "nsIVoicemailProvider.h"
+
+class JSObject;
+struct JSContext;
+
+class nsPIDOMWindow;
+class nsIDOMMozVoicemailStatus;
+
+namespace mozilla {
+namespace dom {
+
+class Voicemail MOZ_FINAL : public DOMEventTargetHelper
+{
+  /**
+   * Class Voicemail doesn't actually inherit nsIVoicemailListener. Instead, it
+   * owns an nsIVoicemailListener derived instance mListener and passes it to
+   * nsIVoicemailProvider. The onreceived events are first delivered to
+   * mListener and then forwarded to its owner, Voicemail. See also bug 775997
+   * comment #51.
+   */
+  class Listener;
+
+public:
+  NS_DECL_NSIVOICEMAILLISTENER
+
+  NS_REALLY_FORWARD_NSIDOMEVENTTARGET(DOMEventTargetHelper)
+
+  Voicemail(nsPIDOMWindow* aWindow, nsIVoicemailProvider* aProvider);
+
+  virtual ~Voicemail();
+
+  nsPIDOMWindow*
+  GetParentObject() const
+  {
+    return GetOwner();
+  }
+
+  virtual JSObject*
+  WrapObject(JSContext* aCx) MOZ_OVERRIDE;
+
+  already_AddRefed<nsIDOMMozVoicemailStatus>
+  GetStatus(const Optional<uint32_t>& aServiceId, ErrorResult& aRv) const;
+
+  void
+  GetNumber(const Optional<uint32_t>& aServiceId, nsString& aNumber,
+            ErrorResult& aRv) const;
+
+  void
+  GetDisplayName(const Optional<uint32_t>& aServiceId, nsString& aDisplayName,
+                 ErrorResult& aRv) const;
+
+  IMPL_EVENT_HANDLER(statuschanged)
+
+private:
+  nsCOMPtr<nsIVoicemailProvider> mProvider;
+  nsRefPtr<Listener> mListener;
+
+  bool
+  IsValidServiceId(uint32_t aServiceId) const;
+
+  bool
+  PassedOrDefaultServiceId(const Optional<uint32_t>& aServiceId,
+                           uint32_t& aResult) const;
+};
+
+} // namespace dom
+} // namespace mozilla
+
+nsresult
+NS_NewVoicemail(nsPIDOMWindow* aWindow,
+                mozilla::dom::Voicemail** aVoicemail);
+
+#endif // mozilla_dom_voicemail_voicemail_h__