зеркало из https://github.com/mozilla/gecko-dev.git
Backed out changeset a5c28b69a261 (bug 978639)
This commit is contained in:
Родитель
7af44b9a9b
Коммит
b66d34932b
|
@ -277,28 +277,6 @@ TelephonyCallGroup::Remove(TelephonyCall& aCall, ErrorResult& aRv)
|
|||
}
|
||||
}
|
||||
|
||||
already_AddRefed<Promise>
|
||||
TelephonyCallGroup::HangUp(ErrorResult& aRv)
|
||||
{
|
||||
MOZ_ASSERT(!mCalls.IsEmpty());
|
||||
|
||||
nsCOMPtr<nsIGlobalObject> global = do_QueryInterface(GetOwner());
|
||||
if (!global) {
|
||||
aRv.Throw(NS_ERROR_FAILURE);
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
nsRefPtr<Promise> promise = Promise::Create(global, aRv);
|
||||
NS_ENSURE_TRUE(!aRv.Failed(), nullptr);
|
||||
|
||||
nsCOMPtr<nsITelephonyCallback> callback = new TelephonyCallback(promise);
|
||||
aRv = mTelephony->Service()->HangUpConference(mCalls[0]->ServiceId(),
|
||||
callback);
|
||||
NS_ENSURE_TRUE(!aRv.Failed(), nullptr);
|
||||
|
||||
return promise.forget();
|
||||
}
|
||||
|
||||
void
|
||||
TelephonyCallGroup::Hold(ErrorResult& aRv)
|
||||
{
|
||||
|
|
|
@ -7,7 +7,6 @@
|
|||
#ifndef mozilla_dom_telephony_telephonycallgroup_h__
|
||||
#define mozilla_dom_telephony_telephonycallgroup_h__
|
||||
|
||||
#include "mozilla/dom/Promise.h"
|
||||
#include "mozilla/dom/telephony/TelephonyCommon.h"
|
||||
|
||||
namespace mozilla {
|
||||
|
@ -53,9 +52,6 @@ public:
|
|||
void
|
||||
Remove(TelephonyCall& aCall, ErrorResult& aRv);
|
||||
|
||||
already_AddRefed<Promise>
|
||||
HangUp(ErrorResult& aRv);
|
||||
|
||||
void
|
||||
Hold(ErrorResult& aRv);
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче