| Index: chrome/browser/extensions/api/bluetooth_socket/bluetooth_socket_api.h
|
| diff --git a/chrome/browser/extensions/api/bluetooth_socket/bluetooth_socket_api.h b/chrome/browser/extensions/api/bluetooth_socket/bluetooth_socket_api.h
|
| index 02f7937410fd4ed68130c99166d6033c4d1616e3..435d22bc68dea25df30f9778cbc7ed30ca5097fe 100644
|
| --- a/chrome/browser/extensions/api/bluetooth_socket/bluetooth_socket_api.h
|
| +++ b/chrome/browser/extensions/api/bluetooth_socket/bluetooth_socket_api.h
|
| @@ -11,29 +11,29 @@
|
| namespace extensions {
|
| namespace api {
|
|
|
| -class BluetoothSocketCreateFunction : public UIThreadExtensionFunction {
|
| +class BluetoothSocketCreateFunction : public AsyncExtensionFunction {
|
| public:
|
| DECLARE_EXTENSION_FUNCTION("bluetoothSocket.create", BLUETOOTHSOCKET_CREATE);
|
|
|
| protected:
|
| virtual ~BluetoothSocketCreateFunction() {}
|
|
|
| - // UIThreadExtensionFunction override:
|
| - virtual bool RunImpl() OVERRIDE;
|
| + // AsyncExtensionFunction override:
|
| + virtual bool RunAsync() OVERRIDE;
|
| };
|
|
|
| -class BluetoothSocketUpdateFunction : public UIThreadExtensionFunction {
|
| +class BluetoothSocketUpdateFunction : public AsyncExtensionFunction {
|
| public:
|
| DECLARE_EXTENSION_FUNCTION("bluetoothSocket.update", BLUETOOTHSOCKET_UPDATE);
|
|
|
| protected:
|
| virtual ~BluetoothSocketUpdateFunction() {}
|
|
|
| - // UIThreadExtensionFunction override:
|
| - virtual bool RunImpl() OVERRIDE;
|
| + // AsyncExtensionFunction override:
|
| + virtual bool RunAsync() OVERRIDE;
|
| };
|
|
|
| -class BluetoothSocketSetPausedFunction : public UIThreadExtensionFunction {
|
| +class BluetoothSocketSetPausedFunction : public AsyncExtensionFunction {
|
| public:
|
| DECLARE_EXTENSION_FUNCTION("bluetoothSocket.setPaused",
|
| BLUETOOTHSOCKET_SETPAUSED);
|
| @@ -41,12 +41,11 @@ class BluetoothSocketSetPausedFunction : public UIThreadExtensionFunction {
|
| protected:
|
| virtual ~BluetoothSocketSetPausedFunction() {}
|
|
|
| - // UIThreadExtensionFunction override:
|
| - virtual bool RunImpl() OVERRIDE;
|
| + // AsyncExtensionFunction override:
|
| + virtual bool RunAsync() OVERRIDE;
|
| };
|
|
|
| -class BluetoothSocketListenUsingRfcommFunction
|
| - : public UIThreadExtensionFunction {
|
| +class BluetoothSocketListenUsingRfcommFunction : public AsyncExtensionFunction {
|
| public:
|
| DECLARE_EXTENSION_FUNCTION("bluetoothSocket.listenUsingRfcomm",
|
| BLUETOOTHSOCKET_LISTENUSINGRFCOMM);
|
| @@ -54,12 +53,12 @@ class BluetoothSocketListenUsingRfcommFunction
|
| protected:
|
| virtual ~BluetoothSocketListenUsingRfcommFunction() {}
|
|
|
| - // UIThreadExtensionFunction override:
|
| - virtual bool RunImpl() OVERRIDE;
|
| + // AsyncExtensionFunction override:
|
| + virtual bool RunAsync() OVERRIDE;
|
| };
|
|
|
| class BluetoothSocketListenUsingInsecureRfcommFunction
|
| - : public UIThreadExtensionFunction {
|
| + : public AsyncExtensionFunction {
|
| public:
|
| DECLARE_EXTENSION_FUNCTION("bluetoothSocket.listenUsingInsecureRfcomm",
|
| BLUETOOTHSOCKET_LISTENUSINGINSECURERFCOMM);
|
| @@ -67,12 +66,11 @@ class BluetoothSocketListenUsingInsecureRfcommFunction
|
| protected:
|
| virtual ~BluetoothSocketListenUsingInsecureRfcommFunction() {}
|
|
|
| - // UIThreadExtensionFunction override:
|
| - virtual bool RunImpl() OVERRIDE;
|
| + // AsyncExtensionFunction override:
|
| + virtual bool RunAsync() OVERRIDE;
|
| };
|
|
|
| -class BluetoothSocketListenUsingL2capFunction
|
| - : public UIThreadExtensionFunction {
|
| +class BluetoothSocketListenUsingL2capFunction : public AsyncExtensionFunction {
|
| public:
|
| DECLARE_EXTENSION_FUNCTION("bluetoothSocket.listenUsingL2cap",
|
| BLUETOOTHSOCKET_LISTENUSINGL2CAP);
|
| @@ -80,11 +78,11 @@ class BluetoothSocketListenUsingL2capFunction
|
| protected:
|
| virtual ~BluetoothSocketListenUsingL2capFunction() {}
|
|
|
| - // UIThreadExtensionFunction override:
|
| - virtual bool RunImpl() OVERRIDE;
|
| + // AsyncExtensionFunction override:
|
| + virtual bool RunAsync() OVERRIDE;
|
| };
|
|
|
| -class BluetoothSocketConnectFunction : public UIThreadExtensionFunction {
|
| +class BluetoothSocketConnectFunction : public AsyncExtensionFunction {
|
| public:
|
| DECLARE_EXTENSION_FUNCTION("bluetoothSocket.connect",
|
| BLUETOOTHSOCKET_CONNECT);
|
| @@ -92,11 +90,11 @@ class BluetoothSocketConnectFunction : public UIThreadExtensionFunction {
|
| protected:
|
| virtual ~BluetoothSocketConnectFunction() {}
|
|
|
| - // UIThreadExtensionFunction override:
|
| - virtual bool RunImpl() OVERRIDE;
|
| + // AsyncExtensionFunction override:
|
| + virtual bool RunAsync() OVERRIDE;
|
| };
|
|
|
| -class BluetoothSocketDisconnectFunction : public UIThreadExtensionFunction {
|
| +class BluetoothSocketDisconnectFunction : public AsyncExtensionFunction {
|
| public:
|
| DECLARE_EXTENSION_FUNCTION("bluetoothSocket.disconnect",
|
| BLUETOOTHSOCKET_DISCONNECT);
|
| @@ -104,33 +102,33 @@ class BluetoothSocketDisconnectFunction : public UIThreadExtensionFunction {
|
| protected:
|
| virtual ~BluetoothSocketDisconnectFunction() {}
|
|
|
| - // UIThreadExtensionFunction override:
|
| - virtual bool RunImpl() OVERRIDE;
|
| + // AsyncExtensionFunction override:
|
| + virtual bool RunAsync() OVERRIDE;
|
| };
|
|
|
| -class BluetoothSocketCloseFunction : public UIThreadExtensionFunction {
|
| +class BluetoothSocketCloseFunction : public AsyncExtensionFunction {
|
| public:
|
| DECLARE_EXTENSION_FUNCTION("bluetoothSocket.close", BLUETOOTHSOCKET_CLOSE);
|
|
|
| protected:
|
| virtual ~BluetoothSocketCloseFunction() {}
|
|
|
| - // UIThreadExtensionFunction override:
|
| - virtual bool RunImpl() OVERRIDE;
|
| + // AsyncExtensionFunction override:
|
| + virtual bool RunAsync() OVERRIDE;
|
| };
|
|
|
| -class BluetoothSocketSendFunction : public UIThreadExtensionFunction {
|
| +class BluetoothSocketSendFunction : public AsyncExtensionFunction {
|
| public:
|
| DECLARE_EXTENSION_FUNCTION("bluetoothSocket.send", BLUETOOTHSOCKET_SEND);
|
|
|
| protected:
|
| virtual ~BluetoothSocketSendFunction() {}
|
|
|
| - // UIThreadExtensionFunction override:
|
| - virtual bool RunImpl() OVERRIDE;
|
| + // AsyncExtensionFunction override:
|
| + virtual bool RunAsync() OVERRIDE;
|
| };
|
|
|
| -class BluetoothSocketGetInfoFunction : public UIThreadExtensionFunction {
|
| +class BluetoothSocketGetInfoFunction : public AsyncExtensionFunction {
|
| public:
|
| DECLARE_EXTENSION_FUNCTION("bluetoothSocket.getInfo",
|
| BLUETOOTHSOCKET_GETINFO);
|
| @@ -138,11 +136,11 @@ class BluetoothSocketGetInfoFunction : public UIThreadExtensionFunction {
|
| protected:
|
| virtual ~BluetoothSocketGetInfoFunction() {}
|
|
|
| - // UIThreadExtensionFunction override:
|
| - virtual bool RunImpl() OVERRIDE;
|
| + // AsyncExtensionFunction override:
|
| + virtual bool RunAsync() OVERRIDE;
|
| };
|
|
|
| -class BluetoothSocketGetSocketsFunction : public UIThreadExtensionFunction {
|
| +class BluetoothSocketGetSocketsFunction : public AsyncExtensionFunction {
|
| public:
|
| DECLARE_EXTENSION_FUNCTION("bluetoothSocket.getSockets",
|
| BLUETOOTHSOCKET_GETSOCKETS);
|
| @@ -150,8 +148,8 @@ class BluetoothSocketGetSocketsFunction : public UIThreadExtensionFunction {
|
| protected:
|
| virtual ~BluetoothSocketGetSocketsFunction() {}
|
|
|
| - // UIThreadExtensionFunction override:
|
| - virtual bool RunImpl() OVERRIDE;
|
| + // AsyncExtensionFunction override:
|
| + virtual bool RunAsync() OVERRIDE;
|
| };
|
|
|
| } // namespace api
|
|
|