Bug 979370: Remove |BluetoothService::IsEnabledInternal|, r=echou

The method |IsEnabledInternal| of |BluetoothService| is not used
any longer. This patch removes it.
This commit is contained in:
Thomas Zimmermann 2014-03-14 10:50:29 +01:00
parent 48270a0cf3
commit 8b1eb0343a
7 changed files with 0 additions and 42 deletions

View File

@ -359,15 +359,6 @@ protected:
virtual nsresult
StopInternal() = 0;
/**
* Platform specific startup functions go here. Usually deals with member
* variables, so not static. Guaranteed to be called outside of main thread.
*
* @return true if Bluetooth is enabled, false otherwise
*/
virtual bool
IsEnabledInternal() = 0;
/**
* Called when XPCOM first creates this service.
*/

View File

@ -770,14 +770,6 @@ BluetoothServiceBluedroid::StopInternal()
return ret;
}
bool
BluetoothServiceBluedroid::IsEnabledInternal()
{
MOZ_ASSERT(!NS_IsMainThread());
return sIsBtEnabled;
}
nsresult
BluetoothServiceBluedroid::GetDefaultAdapterPathInternal(
BluetoothReplyRunnable* aRunnable)

View File

@ -24,7 +24,6 @@ public:
virtual nsresult StartInternal();
virtual nsresult StopInternal();
virtual bool IsEnabledInternal();
virtual nsresult GetDefaultAdapterPathInternal(
BluetoothReplyRunnable* aRunnable);

View File

@ -2115,18 +2115,6 @@ BluetoothDBusService::StopInternal()
return rv;
}
bool
BluetoothDBusService::IsEnabledInternal()
{
MOZ_ASSERT(!NS_IsMainThread()); // BT thread
#ifdef MOZ_WIDGET_GONK
return sBluedroid.IsEnabled();
#else
return mEnabled;
#endif
}
class DefaultAdapterPathReplyHandler : public DBusReplyHandler
{
public:

View File

@ -53,8 +53,6 @@ public:
virtual nsresult StopInternal() MOZ_OVERRIDE;
virtual bool IsEnabledInternal() MOZ_OVERRIDE;
virtual nsresult GetDefaultAdapterPathInternal(
BluetoothReplyRunnable* aRunnable) MOZ_OVERRIDE;

View File

@ -389,12 +389,6 @@ BluetoothServiceChildProcess::StopInternal()
MOZ_CRASH("This should never be called!");
}
bool
BluetoothServiceChildProcess::IsEnabledInternal()
{
MOZ_CRASH("This should never be called!");
}
bool
BluetoothServiceChildProcess::IsConnected(uint16_t aServiceUuid)
{

View File

@ -207,10 +207,6 @@ private:
virtual nsresult
StopInternal() MOZ_OVERRIDE;
// This method should never be called.
virtual bool
IsEnabledInternal() MOZ_OVERRIDE;
bool
IsSignalRegistered(const nsAString& aNodeName) {
return !!mBluetoothSignalObserverTable.Get(aNodeName);