Bug 942104 - Fix a mismerge from the backout on a CLOSED TREE; a=Tomcat

This commit is contained in:
Ms2ger 2013-12-20 15:19:14 +01:00
Родитель c06b5115b3
Коммит df65132615
1 изменённых файлов: 0 добавлений и 13 удалений

Просмотреть файл

@ -321,19 +321,6 @@ BluetoothAdapter::Notify(const BluetoothSignal& aData)
for (uint32_t i = 0, propCount = arr.Length(); i < propCount; ++i) {
SetPropertyByValue(arr[i]);
}
} else if (aData.name().EqualsLiteral(DISCOVERY_STATE_CHANGED_ID)) {
MOZ_ASSERT(v.type() == BluetoothValue::Tbool);
bool isDiscovering = v.get_bool();
nsCOMPtr<nsIDOMEvent> event;
NS_NewDOMBluetoothDiscoveryStateChangedEvent(
getter_AddRefs(event), this, nullptr, nullptr);
nsCOMPtr<nsIDOMBluetoothDiscoveryStateChangedEvent> e =
do_QueryInterface(event);
e->InitBluetoothDiscoveryStateChangedEvent(aData.name(), false, false,
isDiscovering);
DispatchTrustedEvent(event);
} else if (aData.name().EqualsLiteral(PAIRED_STATUS_CHANGED_ID) ||
aData.name().EqualsLiteral(HFP_STATUS_CHANGED_ID) ||
aData.name().EqualsLiteral(SCO_STATUS_CHANGED_ID) ||