| Index: chrome/browser/extensions/api/bluetooth/bluetooth_private_api.h
|
| diff --git a/chrome/browser/extensions/api/bluetooth/bluetooth_private_api.h b/chrome/browser/extensions/api/bluetooth/bluetooth_private_api.h
|
| index 5c65e0fee8ee1f2da38ce9269b45a509c8e17f89..369088903a37513a9dd5358b6840f0d8d013c2c3 100644
|
| --- a/chrome/browser/extensions/api/bluetooth/bluetooth_private_api.h
|
| +++ b/chrome/browser/extensions/api/bluetooth/bluetooth_private_api.h
|
| @@ -65,7 +65,7 @@ class BluetoothPrivateSetAdapterStateFunction
|
| void SendError();
|
|
|
| // BluetoothExtensionFunction overrides:
|
| - virtual bool DoWork(scoped_refptr<device::BluetoothAdapter> adapter) OVERRIDE;
|
| + virtual void DoWork(scoped_refptr<device::BluetoothAdapter> adapter) OVERRIDE;
|
|
|
| // Set of expected adapter properties to be changed.
|
| std::set<std::string> pending_properties_;
|
| @@ -76,34 +76,6 @@ class BluetoothPrivateSetAdapterStateFunction
|
| DISALLOW_COPY_AND_ASSIGN(BluetoothPrivateSetAdapterStateFunction);
|
| };
|
|
|
| -class BluetoothPrivateEnablePairingFunction
|
| - : public BluetoothExtensionFunction {
|
| - public:
|
| - DECLARE_EXTENSION_FUNCTION("bluetoothPrivate.enablePairing",
|
| - BLUETOOTHPRIVATE_ENABLEPAIRING)
|
| - BluetoothPrivateEnablePairingFunction();
|
| - // BluetoothExtensionFunction overrides:
|
| - virtual bool DoWork(scoped_refptr<device::BluetoothAdapter> adapter) OVERRIDE;
|
| -
|
| - private:
|
| - virtual ~BluetoothPrivateEnablePairingFunction();
|
| - DISALLOW_COPY_AND_ASSIGN(BluetoothPrivateEnablePairingFunction);
|
| -};
|
| -
|
| -class BluetoothPrivateDisablePairingFunction
|
| - : public BluetoothExtensionFunction {
|
| - public:
|
| - DECLARE_EXTENSION_FUNCTION("bluetoothPrivate.disablePairing",
|
| - BLUETOOTHPRIVATE_DISABLEPAIRING)
|
| - BluetoothPrivateDisablePairingFunction();
|
| - // BluetoothExtensionFunction overrides:
|
| - virtual bool DoWork(scoped_refptr<device::BluetoothAdapter> adapter) OVERRIDE;
|
| -
|
| - private:
|
| - virtual ~BluetoothPrivateDisablePairingFunction();
|
| - DISALLOW_COPY_AND_ASSIGN(BluetoothPrivateDisablePairingFunction);
|
| -};
|
| -
|
| class BluetoothPrivateSetPairingResponseFunction
|
| : public BluetoothExtensionFunction {
|
| public:
|
| @@ -111,7 +83,7 @@ class BluetoothPrivateSetPairingResponseFunction
|
| BLUETOOTHPRIVATE_SETPAIRINGRESPONSE)
|
| BluetoothPrivateSetPairingResponseFunction();
|
| // BluetoothExtensionFunction overrides:
|
| - virtual bool DoWork(scoped_refptr<device::BluetoothAdapter> adapter) OVERRIDE;
|
| + virtual void DoWork(scoped_refptr<device::BluetoothAdapter> adapter) OVERRIDE;
|
|
|
| private:
|
| virtual ~BluetoothPrivateSetPairingResponseFunction();
|
|
|