diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-05-13 00:08:52 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-05-13 00:08:52 +0200 |
| commit | e16bcd08aae85a7d9c2de5a4b1c733280cb81112 (patch) | |
| tree | 220026724ceb8fbcf18bf627fde022c2d8df0e91 /dom/media/MediaManager.cpp | |
| parent | 6571d2ceb42930dab01677ef0e95e732d5076fb8 (diff) | |
| download | UXP-e16bcd08aae85a7d9c2de5a4b1c733280cb81112.tar UXP-e16bcd08aae85a7d9c2de5a4b1c733280cb81112.tar.gz UXP-e16bcd08aae85a7d9c2de5a4b1c733280cb81112.tar.lz UXP-e16bcd08aae85a7d9c2de5a4b1c733280cb81112.tar.xz UXP-e16bcd08aae85a7d9c2de5a4b1c733280cb81112.zip | |
Remove MOZ_WIDGET_GONK [2/2]
Tag #288
Diffstat (limited to 'dom/media/MediaManager.cpp')
| -rw-r--r-- | dom/media/MediaManager.cpp | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/dom/media/MediaManager.cpp b/dom/media/MediaManager.cpp index 44f330e99..ba6b4cd47 100644 --- a/dom/media/MediaManager.cpp +++ b/dom/media/MediaManager.cpp @@ -13,9 +13,6 @@ #include "nsArray.h" #include "nsContentUtils.h" #include "nsHashPropertyBag.h" -#ifdef MOZ_WIDGET_GONK -#include "nsIAudioManager.h" -#endif #include "nsIEventTarget.h" #include "nsIUUIDGenerator.h" #include "nsIScriptGlobalObject.h" @@ -1569,7 +1566,7 @@ private: RefPtr<MediaManager> mManager; // get ref to this when creating the runnable }; -#if defined(ANDROID) && !defined(MOZ_WIDGET_GONK) +#if defined(ANDROID) class GetUserMediaRunnableWrapper : public Runnable { public: @@ -3042,18 +3039,6 @@ MediaManager::Observe(nsISupports* aSubject, const char* aTopic, } return NS_OK; } -#ifdef MOZ_WIDGET_GONK - else if (!strcmp(aTopic, "phone-state-changed")) { - nsString state(aData); - nsresult rv; - uint32_t phoneState = state.ToInteger(&rv); - - if (NS_SUCCEEDED(rv) && phoneState == nsIAudioManager::PHONE_STATE_IN_CALL) { - StopMediaStreams(); - } - return NS_OK; - } -#endif return NS_OK; } |