diff options
author | wolfbeast <mcwerewolf@gmail.com> | 2018-02-24 22:12:27 +0100 |
---|---|---|
committer | wolfbeast <mcwerewolf@gmail.com> | 2018-02-24 22:12:27 +0100 |
commit | e10dfb62ff916d49632febb59565f3c52f4970bd (patch) | |
tree | e3162c57574bcf7f91d262d9a8cd70ece01f9edb /dom/base/Navigator.h | |
parent | fd6b1ad6f9768556bb03a0fbdb16587fdfd0a962 (diff) | |
parent | 27727874636868dc6d61e8117f81cd761c91e2ed (diff) | |
download | UXP-e10dfb62ff916d49632febb59565f3c52f4970bd.tar UXP-e10dfb62ff916d49632febb59565f3c52f4970bd.tar.gz UXP-e10dfb62ff916d49632febb59565f3c52f4970bd.tar.lz UXP-e10dfb62ff916d49632febb59565f3c52f4970bd.tar.xz UXP-e10dfb62ff916d49632febb59565f3c52f4970bd.zip |
Merge branch 'EME-work'
Diffstat (limited to 'dom/base/Navigator.h')
-rw-r--r-- | dom/base/Navigator.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/dom/base/Navigator.h b/dom/base/Navigator.h index 4b4ae6759..d47a80bc1 100644 --- a/dom/base/Navigator.h +++ b/dom/base/Navigator.h @@ -18,7 +18,9 @@ #include "nsString.h" #include "nsTArray.h" #include "nsWeakPtr.h" +#ifdef MOZ_EME #include "mozilla/dom/MediaKeySystemAccessManager.h" +#endif class nsPluginArray; class nsMimeTypeArray; @@ -258,12 +260,14 @@ public: // any, else null. static already_AddRefed<nsPIDOMWindowInner> GetWindowFromGlobal(JSObject* aGlobal); +#ifdef MOZ_EME already_AddRefed<Promise> RequestMediaKeySystemAccess(const nsAString& aKeySystem, const Sequence<MediaKeySystemConfiguration>& aConfig, ErrorResult& aRv); private: RefPtr<MediaKeySystemAccessManager> mMediaKeySystemAccessManager; +#endif public: void NotifyVRDisplaysUpdated(); |