| Index: chrome/browser/extensions/api/gcd_private/gcd_private_api.h
|
| diff --git a/chrome/browser/extensions/api/gcd_private/gcd_private_api.h b/chrome/browser/extensions/api/gcd_private/gcd_private_api.h
|
| index 42fa26aba21fe135ca0e537540ed24f2078200c0..1cc6bc680927d81540e2ccd1ccf3f197f476c3fa 100644
|
| --- a/chrome/browser/extensions/api/gcd_private/gcd_private_api.h
|
| +++ b/chrome/browser/extensions/api/gcd_private/gcd_private_api.h
|
| @@ -98,7 +98,7 @@ class GcdPrivateGetCloudDeviceListFunction
|
| };
|
|
|
| class GcdPrivateQueryForNewLocalDevicesFunction
|
| - : public ChromeAsyncExtensionFunction {
|
| + : public ChromeSyncExtensionFunction {
|
| public:
|
| DECLARE_EXTENSION_FUNCTION("gcdPrivate.queryForNewLocalDevices",
|
| GCDPRIVATE_QUERYFORNEWLOCALDEVICES)
|
| @@ -108,8 +108,8 @@ class GcdPrivateQueryForNewLocalDevicesFunction
|
| protected:
|
| virtual ~GcdPrivateQueryForNewLocalDevicesFunction();
|
|
|
| - // AsyncExtensionFunction overrides.
|
| - virtual bool RunAsync() OVERRIDE;
|
| + // SyncExtensionFunction overrides.
|
| + virtual bool RunSync() OVERRIDE;
|
| };
|
|
|
| class GcdPrivateStartSetupFunction : public ChromeAsyncExtensionFunction {
|
| @@ -128,15 +128,15 @@ class GcdPrivateStartSetupFunction : public ChromeAsyncExtensionFunction {
|
| private:
|
| };
|
|
|
| -class GcdPrivateSetWiFiNetworksFunction : public ChromeAsyncExtensionFunction {
|
| +class GcdPrivateSetWiFiNetworkFunction : public ChromeAsyncExtensionFunction {
|
| public:
|
| - DECLARE_EXTENSION_FUNCTION("gcdPrivate.setWiFiNetworks",
|
| - GCDPRIVATE_SETWIFINETWORKS)
|
| + DECLARE_EXTENSION_FUNCTION("gcdPrivate.setWiFiNetwork",
|
| + GCDPRIVATE_SETWIFINETWORK)
|
|
|
| - GcdPrivateSetWiFiNetworksFunction();
|
| + GcdPrivateSetWiFiNetworkFunction();
|
|
|
| protected:
|
| - virtual ~GcdPrivateSetWiFiNetworksFunction();
|
| + virtual ~GcdPrivateSetWiFiNetworkFunction();
|
|
|
| // AsyncExtensionFunction overrides.
|
| virtual bool RunAsync() OVERRIDE;
|
| @@ -144,16 +144,15 @@ class GcdPrivateSetWiFiNetworksFunction : public ChromeAsyncExtensionFunction {
|
| private:
|
| };
|
|
|
| -class GcdPrivateSetWiFiCredentialsFunction
|
| - : public ChromeAsyncExtensionFunction {
|
| +class GcdPrivateSetWiFiPasswordFunction : public ChromeAsyncExtensionFunction {
|
| public:
|
| - DECLARE_EXTENSION_FUNCTION("gcdPrivate.setWiFiCredentials",
|
| - GCDPRIVATE_SETWIFICREDENTIALS)
|
| + DECLARE_EXTENSION_FUNCTION("gcdPrivate.setWiFiPassword",
|
| + GCDPRIVATE_SETWIFIPASSWORD)
|
|
|
| - GcdPrivateSetWiFiCredentialsFunction();
|
| + GcdPrivateSetWiFiPasswordFunction();
|
|
|
| protected:
|
| - virtual ~GcdPrivateSetWiFiCredentialsFunction();
|
| + virtual ~GcdPrivateSetWiFiPasswordFunction();
|
|
|
| // AsyncExtensionFunction overrides.
|
| virtual bool RunAsync() OVERRIDE;
|
| @@ -191,6 +190,86 @@ class GcdPrivateStopSetupFunction : public ChromeAsyncExtensionFunction {
|
| private:
|
| };
|
|
|
| +class GcdPrivateGetCommandDefinitionsFunction
|
| + : public ChromeAsyncExtensionFunction {
|
| + public:
|
| + DECLARE_EXTENSION_FUNCTION("gcdPrivate.getCommandDefinitions",
|
| + GCDPRIVATE_GETCOMMANDDEFINITIONS)
|
| +
|
| + GcdPrivateGetCommandDefinitionsFunction();
|
| +
|
| + protected:
|
| + virtual ~GcdPrivateGetCommandDefinitionsFunction();
|
| +
|
| + // AsyncExtensionFunction overrides.
|
| + virtual bool RunAsync() OVERRIDE;
|
| +
|
| + private:
|
| +};
|
| +
|
| +class GcdPrivateInsertCommandFunction : public ChromeAsyncExtensionFunction {
|
| + public:
|
| + DECLARE_EXTENSION_FUNCTION("gcdPrivate.insertCommand",
|
| + GCDPRIVATE_INSERTCOMMAND)
|
| +
|
| + GcdPrivateInsertCommandFunction();
|
| +
|
| + protected:
|
| + virtual ~GcdPrivateInsertCommandFunction();
|
| +
|
| + // AsyncExtensionFunction overrides.
|
| + virtual bool RunAsync() OVERRIDE;
|
| +
|
| + private:
|
| +};
|
| +
|
| +class GcdPrivateGetCommandFunction : public ChromeAsyncExtensionFunction {
|
| + public:
|
| + DECLARE_EXTENSION_FUNCTION("gcdPrivate.getCommand", GCDPRIVATE_GETCOMMAND)
|
| +
|
| + GcdPrivateGetCommandFunction();
|
| +
|
| + protected:
|
| + virtual ~GcdPrivateGetCommandFunction();
|
| +
|
| + // AsyncExtensionFunction overrides.
|
| + virtual bool RunAsync() OVERRIDE;
|
| +
|
| + private:
|
| +};
|
| +
|
| +class GcdPrivateCancelCommandFunction : public ChromeAsyncExtensionFunction {
|
| + public:
|
| + DECLARE_EXTENSION_FUNCTION("gcdPrivate.cancelCommand",
|
| + GCDPRIVATE_CANCELCOMMAND)
|
| +
|
| + GcdPrivateCancelCommandFunction();
|
| +
|
| + protected:
|
| + virtual ~GcdPrivateCancelCommandFunction();
|
| +
|
| + // AsyncExtensionFunction overrides.
|
| + virtual bool RunAsync() OVERRIDE;
|
| +
|
| + private:
|
| +};
|
| +
|
| +class GcdPrivateGetCommandsListFunction : public ChromeAsyncExtensionFunction {
|
| + public:
|
| + DECLARE_EXTENSION_FUNCTION("gcdPrivate.getCommandsList",
|
| + GCDPRIVATE_GETCOMMANDSLIST)
|
| +
|
| + GcdPrivateGetCommandsListFunction();
|
| +
|
| + protected:
|
| + virtual ~GcdPrivateGetCommandsListFunction();
|
| +
|
| + // AsyncExtensionFunction overrides.
|
| + virtual bool RunAsync() OVERRIDE;
|
| +
|
| + private:
|
| +};
|
| +
|
| } // namespace extensions
|
|
|
| #endif // CHROME_BROWSER_EXTENSIONS_API_GCD_PRIVATE_GCD_PRIVATE_API_H_
|
|
|