Chromium Code Reviews| Index: extensions/browser/api/networking_private/networking_private_api.h |
| diff --git a/extensions/browser/api/networking_private/networking_private_api.h b/extensions/browser/api/networking_private/networking_private_api.h |
| index 9bfbf60b6cec6a6e9eaefdcece136899a46c3c4b..453989b5e65f4c5d467d19e772972b962c700f77 100644 |
| --- a/extensions/browser/api/networking_private/networking_private_api.h |
| +++ b/extensions/browser/api/networking_private/networking_private_api.h |
| @@ -27,7 +27,8 @@ extern const char kErrorSimLocked[]; |
| } // namespace networking_private |
| // Implements the chrome.networkingPrivate.getProperties method. |
| -class NetworkingPrivateGetPropertiesFunction : public AsyncExtensionFunction { |
| +class NetworkingPrivateGetPropertiesFunction |
| + : public UIThreadExtensionFunction { |
| public: |
| NetworkingPrivateGetPropertiesFunction() {} |
| DECLARE_EXTENSION_FUNCTION("networkingPrivate.getProperties", |
| @@ -36,8 +37,8 @@ class NetworkingPrivateGetPropertiesFunction : public AsyncExtensionFunction { |
| protected: |
| ~NetworkingPrivateGetPropertiesFunction() override; |
| - // AsyncExtensionFunction overrides. |
| - bool RunAsync() override; |
| + // ExtensionFunction:: |
|
Devlin
2017/01/06 15:51:06
nit: One ':'
lazyboy
2017/01/19 03:47:59
Done.
|
| + ResponseAction Run() override; |
| private: |
| void Success(std::unique_ptr<base::DictionaryValue> result); |
| @@ -48,7 +49,7 @@ class NetworkingPrivateGetPropertiesFunction : public AsyncExtensionFunction { |
| // Implements the chrome.networkingPrivate.getManagedProperties method. |
| class NetworkingPrivateGetManagedPropertiesFunction |
| - : public AsyncExtensionFunction { |
| + : public UIThreadExtensionFunction { |
| public: |
| NetworkingPrivateGetManagedPropertiesFunction() {} |
| DECLARE_EXTENSION_FUNCTION("networkingPrivate.getManagedProperties", |
| @@ -57,8 +58,8 @@ class NetworkingPrivateGetManagedPropertiesFunction |
| protected: |
| ~NetworkingPrivateGetManagedPropertiesFunction() override; |
| - // AsyncExtensionFunction overrides. |
| - bool RunAsync() override; |
| + // ExtensionFunction:: |
| + ResponseAction Run() override; |
| private: |
| void Success(std::unique_ptr<base::DictionaryValue> result); |
| @@ -68,7 +69,7 @@ class NetworkingPrivateGetManagedPropertiesFunction |
| }; |
| // Implements the chrome.networkingPrivate.getState method. |
| -class NetworkingPrivateGetStateFunction : public AsyncExtensionFunction { |
| +class NetworkingPrivateGetStateFunction : public UIThreadExtensionFunction { |
| public: |
| NetworkingPrivateGetStateFunction() {} |
| DECLARE_EXTENSION_FUNCTION("networkingPrivate.getState", |
| @@ -77,8 +78,8 @@ class NetworkingPrivateGetStateFunction : public AsyncExtensionFunction { |
| protected: |
| ~NetworkingPrivateGetStateFunction() override; |
| - // AsyncExtensionFunction overrides. |
| - bool RunAsync() override; |
| + // ExtensionFunction:: |
| + ResponseAction Run() override; |
| private: |
| void Success(std::unique_ptr<base::DictionaryValue> result); |
| @@ -88,7 +89,8 @@ class NetworkingPrivateGetStateFunction : public AsyncExtensionFunction { |
| }; |
| // Implements the chrome.networkingPrivate.setProperties method. |
| -class NetworkingPrivateSetPropertiesFunction : public AsyncExtensionFunction { |
| +class NetworkingPrivateSetPropertiesFunction |
| + : public UIThreadExtensionFunction { |
| public: |
| NetworkingPrivateSetPropertiesFunction() {} |
| DECLARE_EXTENSION_FUNCTION("networkingPrivate.setProperties", |
| @@ -97,8 +99,8 @@ class NetworkingPrivateSetPropertiesFunction : public AsyncExtensionFunction { |
| protected: |
| ~NetworkingPrivateSetPropertiesFunction() override; |
| - // AsyncExtensionFunction overrides. |
| - bool RunAsync() override; |
| + // ExtensionFunction:: |
| + ResponseAction Run() override; |
| private: |
| void Success(); |
| @@ -108,7 +110,8 @@ class NetworkingPrivateSetPropertiesFunction : public AsyncExtensionFunction { |
| }; |
| // Implements the chrome.networkingPrivate.createNetwork method. |
| -class NetworkingPrivateCreateNetworkFunction : public AsyncExtensionFunction { |
| +class NetworkingPrivateCreateNetworkFunction |
| + : public UIThreadExtensionFunction { |
| public: |
| NetworkingPrivateCreateNetworkFunction() {} |
| DECLARE_EXTENSION_FUNCTION("networkingPrivate.createNetwork", |
| @@ -117,8 +120,8 @@ class NetworkingPrivateCreateNetworkFunction : public AsyncExtensionFunction { |
| protected: |
| ~NetworkingPrivateCreateNetworkFunction() override; |
| - // AsyncExtensionFunction overrides. |
| - bool RunAsync() override; |
| + // ExtensionFunction:: |
| + ResponseAction Run() override; |
| private: |
| void Success(const std::string& guid); |
| @@ -128,7 +131,8 @@ class NetworkingPrivateCreateNetworkFunction : public AsyncExtensionFunction { |
| }; |
| // Implements the chrome.networkingPrivate.createNetwork method. |
| -class NetworkingPrivateForgetNetworkFunction : public AsyncExtensionFunction { |
| +class NetworkingPrivateForgetNetworkFunction |
| + : public UIThreadExtensionFunction { |
| public: |
| NetworkingPrivateForgetNetworkFunction() {} |
| DECLARE_EXTENSION_FUNCTION("networkingPrivate.forgetNetwork", |
| @@ -137,8 +141,8 @@ class NetworkingPrivateForgetNetworkFunction : public AsyncExtensionFunction { |
| protected: |
| ~NetworkingPrivateForgetNetworkFunction() override; |
| - // AsyncExtensionFunction overrides. |
| - bool RunAsync() override; |
| + // ExtensionFunction:: |
| + ResponseAction Run() override; |
| private: |
| void Success(); |
| @@ -148,7 +152,7 @@ class NetworkingPrivateForgetNetworkFunction : public AsyncExtensionFunction { |
| }; |
| // Implements the chrome.networkingPrivate.getNetworks method. |
| -class NetworkingPrivateGetNetworksFunction : public AsyncExtensionFunction { |
| +class NetworkingPrivateGetNetworksFunction : public UIThreadExtensionFunction { |
| public: |
| NetworkingPrivateGetNetworksFunction() {} |
| DECLARE_EXTENSION_FUNCTION("networkingPrivate.getNetworks", |
| @@ -157,8 +161,8 @@ class NetworkingPrivateGetNetworksFunction : public AsyncExtensionFunction { |
| protected: |
| ~NetworkingPrivateGetNetworksFunction() override; |
| - // AsyncExtensionFunction overrides. |
| - bool RunAsync() override; |
| + // ExtensionFunction:: |
| + ResponseAction Run() override; |
| private: |
| void Success(std::unique_ptr<base::ListValue> network_list); |
| @@ -169,7 +173,7 @@ class NetworkingPrivateGetNetworksFunction : public AsyncExtensionFunction { |
| // Implements the chrome.networkingPrivate.getVisibleNetworks method. |
| class NetworkingPrivateGetVisibleNetworksFunction |
| - : public AsyncExtensionFunction { |
| + : public UIThreadExtensionFunction { |
| public: |
| NetworkingPrivateGetVisibleNetworksFunction() {} |
| DECLARE_EXTENSION_FUNCTION("networkingPrivate.getVisibleNetworks", |
| @@ -178,8 +182,8 @@ class NetworkingPrivateGetVisibleNetworksFunction |
| protected: |
| ~NetworkingPrivateGetVisibleNetworksFunction() override; |
| - // AsyncExtensionFunction overrides. |
| - bool RunAsync() override; |
| + // ExtensionFunction:: |
| + ResponseAction Run() override; |
| private: |
| void Success(std::unique_ptr<base::ListValue> network_list); |
| @@ -279,7 +283,7 @@ class NetworkingPrivateRequestNetworkScanFunction |
| }; |
| // Implements the chrome.networkingPrivate.startConnect method. |
| -class NetworkingPrivateStartConnectFunction : public AsyncExtensionFunction { |
| +class NetworkingPrivateStartConnectFunction : public UIThreadExtensionFunction { |
| public: |
| NetworkingPrivateStartConnectFunction() {} |
| DECLARE_EXTENSION_FUNCTION("networkingPrivate.startConnect", |
| @@ -288,8 +292,8 @@ class NetworkingPrivateStartConnectFunction : public AsyncExtensionFunction { |
| protected: |
| ~NetworkingPrivateStartConnectFunction() override; |
| - // AsyncExtensionFunction overrides. |
| - bool RunAsync() override; |
| + // ExtensionFunction:: |
| + ResponseAction Run() override; |
| private: |
| void Success(); |
| @@ -299,7 +303,8 @@ class NetworkingPrivateStartConnectFunction : public AsyncExtensionFunction { |
| }; |
| // Implements the chrome.networkingPrivate.startDisconnect method. |
| -class NetworkingPrivateStartDisconnectFunction : public AsyncExtensionFunction { |
| +class NetworkingPrivateStartDisconnectFunction |
| + : public UIThreadExtensionFunction { |
| public: |
| NetworkingPrivateStartDisconnectFunction() {} |
| DECLARE_EXTENSION_FUNCTION("networkingPrivate.startDisconnect", |
| @@ -308,8 +313,8 @@ class NetworkingPrivateStartDisconnectFunction : public AsyncExtensionFunction { |
| protected: |
| ~NetworkingPrivateStartDisconnectFunction() override; |
| - // AsyncExtensionFunction overrides. |
| - bool RunAsync() override; |
| + // ExtensionFunction:: |
| + ResponseAction Run() override; |
| private: |
| void Success(); |
| @@ -319,7 +324,8 @@ class NetworkingPrivateStartDisconnectFunction : public AsyncExtensionFunction { |
| }; |
| // Implements the chrome.networkingPrivate.startActivate method. |
| -class NetworkingPrivateStartActivateFunction : public AsyncExtensionFunction { |
| +class NetworkingPrivateStartActivateFunction |
| + : public UIThreadExtensionFunction { |
| public: |
| NetworkingPrivateStartActivateFunction() {} |
| DECLARE_EXTENSION_FUNCTION("networkingPrivate.startActivate", |
| @@ -328,8 +334,8 @@ class NetworkingPrivateStartActivateFunction : public AsyncExtensionFunction { |
| protected: |
| ~NetworkingPrivateStartActivateFunction() override; |
| - // AsyncExtensionFunction overrides. |
| - bool RunAsync() override; |
| + // ExtensionFunction:: |
| + ResponseAction Run() override; |
| private: |
| void Success(); |
| @@ -340,7 +346,7 @@ class NetworkingPrivateStartActivateFunction : public AsyncExtensionFunction { |
| // Implements the chrome.networkingPrivate.verifyDestination method. |
| class NetworkingPrivateVerifyDestinationFunction |
| - : public AsyncExtensionFunction { |
| + : public UIThreadExtensionFunction { |
| public: |
| NetworkingPrivateVerifyDestinationFunction() {} |
| DECLARE_EXTENSION_FUNCTION("networkingPrivate.verifyDestination", |
| @@ -349,8 +355,8 @@ class NetworkingPrivateVerifyDestinationFunction |
| protected: |
| ~NetworkingPrivateVerifyDestinationFunction() override; |
| - // AsyncExtensionFunction overrides. |
| - bool RunAsync() override; |
| + // ExtensionFunction:: |
| + ResponseAction Run() override; |
| void Success(bool result); |
| void Failure(const std::string& error); |
| @@ -361,7 +367,7 @@ class NetworkingPrivateVerifyDestinationFunction |
| // Implements the chrome.networkingPrivate.verifyAndEncryptCredentials method. |
| class NetworkingPrivateVerifyAndEncryptCredentialsFunction |
| - : public AsyncExtensionFunction { |
| + : public UIThreadExtensionFunction { |
| public: |
| NetworkingPrivateVerifyAndEncryptCredentialsFunction() {} |
| DECLARE_EXTENSION_FUNCTION("networkingPrivate.verifyAndEncryptCredentials", |
| @@ -370,8 +376,8 @@ class NetworkingPrivateVerifyAndEncryptCredentialsFunction |
| protected: |
| ~NetworkingPrivateVerifyAndEncryptCredentialsFunction() override; |
| - // AsyncExtensionFunction overrides. |
| - bool RunAsync() override; |
| + // ExtensionFunction:: |
| + ResponseAction Run() override; |
| void Success(const std::string& result); |
| void Failure(const std::string& error); |
| @@ -383,7 +389,7 @@ class NetworkingPrivateVerifyAndEncryptCredentialsFunction |
| // Implements the chrome.networkingPrivate.verifyAndEncryptData method. |
| class NetworkingPrivateVerifyAndEncryptDataFunction |
| - : public AsyncExtensionFunction { |
| + : public UIThreadExtensionFunction { |
| public: |
| NetworkingPrivateVerifyAndEncryptDataFunction() {} |
| DECLARE_EXTENSION_FUNCTION("networkingPrivate.verifyAndEncryptData", |
| @@ -392,8 +398,8 @@ class NetworkingPrivateVerifyAndEncryptDataFunction |
| protected: |
| ~NetworkingPrivateVerifyAndEncryptDataFunction() override; |
| - // AsyncExtensionFunction overrides. |
| - bool RunAsync() override; |
| + // ExtensionFunction:: |
| + ResponseAction Run() override; |
| void Success(const std::string& result); |
| void Failure(const std::string& error); |
| @@ -404,7 +410,7 @@ class NetworkingPrivateVerifyAndEncryptDataFunction |
| // Implements the chrome.networkingPrivate.setWifiTDLSEnabledState method. |
| class NetworkingPrivateSetWifiTDLSEnabledStateFunction |
| - : public AsyncExtensionFunction { |
| + : public UIThreadExtensionFunction { |
| public: |
| NetworkingPrivateSetWifiTDLSEnabledStateFunction() {} |
| DECLARE_EXTENSION_FUNCTION("networkingPrivate.setWifiTDLSEnabledState", |
| @@ -413,8 +419,8 @@ class NetworkingPrivateSetWifiTDLSEnabledStateFunction |
| protected: |
| ~NetworkingPrivateSetWifiTDLSEnabledStateFunction() override; |
| - // AsyncExtensionFunction overrides. |
| - bool RunAsync() override; |
| + // ExtensionFunction:: |
| + ResponseAction Run() override; |
| void Success(const std::string& result); |
| void Failure(const std::string& error); |
| @@ -425,7 +431,7 @@ class NetworkingPrivateSetWifiTDLSEnabledStateFunction |
| // Implements the chrome.networkingPrivate.getWifiTDLSStatus method. |
| class NetworkingPrivateGetWifiTDLSStatusFunction |
| - : public AsyncExtensionFunction { |
| + : public UIThreadExtensionFunction { |
| public: |
| NetworkingPrivateGetWifiTDLSStatusFunction() {} |
| DECLARE_EXTENSION_FUNCTION("networkingPrivate.getWifiTDLSStatus", |
| @@ -434,8 +440,8 @@ class NetworkingPrivateGetWifiTDLSStatusFunction |
| protected: |
| ~NetworkingPrivateGetWifiTDLSStatusFunction() override; |
| - // AsyncExtensionFunction overrides. |
| - bool RunAsync() override; |
| + // ExtensionFunction:: |
| + ResponseAction Run() override; |
| void Success(const std::string& result); |
| void Failure(const std::string& error); |
| @@ -445,14 +451,14 @@ class NetworkingPrivateGetWifiTDLSStatusFunction |
| }; |
| class NetworkingPrivateGetCaptivePortalStatusFunction |
| - : public AsyncExtensionFunction { |
| + : public UIThreadExtensionFunction { |
| public: |
| NetworkingPrivateGetCaptivePortalStatusFunction() {} |
| DECLARE_EXTENSION_FUNCTION("networkingPrivate.getCaptivePortalStatus", |
| NETWORKINGPRIVATE_GETCAPTIVEPORTALSTATUS); |
| - // AsyncExtensionFunction overrides. |
| - bool RunAsync() override; |
| + // ExtensionFunction:: |
| + ResponseAction Run() override; |
| protected: |
| ~NetworkingPrivateGetCaptivePortalStatusFunction() override; |
| @@ -465,14 +471,14 @@ class NetworkingPrivateGetCaptivePortalStatusFunction |
| }; |
| class NetworkingPrivateUnlockCellularSimFunction |
| - : public AsyncExtensionFunction { |
| + : public UIThreadExtensionFunction { |
| public: |
| NetworkingPrivateUnlockCellularSimFunction() {} |
| DECLARE_EXTENSION_FUNCTION("networkingPrivate.unlockCellularSim", |
| NETWORKINGPRIVATE_UNLOCKCELLULARSIM); |
| - // AsyncExtensionFunction overrides. |
| - bool RunAsync() override; |
| + // ExtensionFunction:: |
| + ResponseAction Run() override; |
| protected: |
| ~NetworkingPrivateUnlockCellularSimFunction() override; |
| @@ -485,14 +491,14 @@ class NetworkingPrivateUnlockCellularSimFunction |
| }; |
| class NetworkingPrivateSetCellularSimStateFunction |
| - : public AsyncExtensionFunction { |
| + : public UIThreadExtensionFunction { |
| public: |
| NetworkingPrivateSetCellularSimStateFunction() {} |
| DECLARE_EXTENSION_FUNCTION("networkingPrivate.setCellularSimState", |
| NETWORKINGPRIVATE_SETCELLULARSIMSTATE); |
| - // AsyncExtensionFunction overrides. |
| - bool RunAsync() override; |
| + // ExtensionFunction:: |
| + ResponseAction Run() override; |
| protected: |
| ~NetworkingPrivateSetCellularSimStateFunction() override; |