Index: chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.h |
diff --git a/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.h b/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.h |
index b658bfb1e64bec9ec1b23beee999279628035ddf..91b95f6aa99595cba95c69f9713833920e593174 100644 |
--- a/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.h |
+++ b/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.h |
@@ -74,15 +74,15 @@ class EasyUnlockPrivateAPI : public BrowserContextKeyedAPI { |
// TODO(tbarzic): Replace SyncExtensionFunction/AsyncExtensionFunction overrides |
// with UIThreadExtensionFunction throughout the file. |
-class EasyUnlockPrivateGetStringsFunction : public SyncExtensionFunction { |
+class EasyUnlockPrivateGetStringsFunction : public UIThreadExtensionFunction { |
public: |
EasyUnlockPrivateGetStringsFunction(); |
protected: |
~EasyUnlockPrivateGetStringsFunction() override; |
- // SyncExtensionFunction: |
- bool RunSync() override; |
+ // ExtensionFunction: |
+ ResponseAction Run() override; |
private: |
DECLARE_EXTENSION_FUNCTION("easyUnlockPrivate.getStrings", |
@@ -209,14 +209,14 @@ class EasyUnlockPrivateConnectToBluetoothServiceInsecurelyFunction |
}; |
class EasyUnlockPrivateUpdateScreenlockStateFunction |
- : public SyncExtensionFunction { |
+ : public UIThreadExtensionFunction { |
public: |
EasyUnlockPrivateUpdateScreenlockStateFunction(); |
protected: |
~EasyUnlockPrivateUpdateScreenlockStateFunction() override; |
- bool RunSync() override; |
+ ResponseAction Run() override; |
private: |
DECLARE_EXTENSION_FUNCTION("easyUnlockPrivate.updateScreenlockState", |
@@ -225,7 +225,8 @@ class EasyUnlockPrivateUpdateScreenlockStateFunction |
DISALLOW_COPY_AND_ASSIGN(EasyUnlockPrivateUpdateScreenlockStateFunction); |
}; |
-class EasyUnlockPrivateSetPermitAccessFunction : public SyncExtensionFunction { |
+class EasyUnlockPrivateSetPermitAccessFunction |
+ : public UIThreadExtensionFunction { |
public: |
DECLARE_EXTENSION_FUNCTION("easyUnlockPrivate.setPermitAccess", |
EASYUNLOCKPRIVATE_SETPERMITACCESS) |
@@ -234,13 +235,14 @@ class EasyUnlockPrivateSetPermitAccessFunction : public SyncExtensionFunction { |
private: |
~EasyUnlockPrivateSetPermitAccessFunction() override; |
- // SyncExtensionFunction: |
- bool RunSync() override; |
+ // ExtensionFunction: |
+ ResponseAction Run() override; |
DISALLOW_COPY_AND_ASSIGN(EasyUnlockPrivateSetPermitAccessFunction); |
}; |
-class EasyUnlockPrivateGetPermitAccessFunction : public SyncExtensionFunction { |
+class EasyUnlockPrivateGetPermitAccessFunction |
+ : public UIThreadExtensionFunction { |
public: |
DECLARE_EXTENSION_FUNCTION("easyUnlockPrivate.getPermitAccess", |
EASYUNLOCKPRIVATE_GETPERMITACCESS) |
@@ -255,18 +257,18 @@ class EasyUnlockPrivateGetPermitAccessFunction : public SyncExtensionFunction { |
std::string* user_private_key); |
private: |
- // SyncExtensionFunction: |
- bool RunSync() override; |
+ // ExtensionFunction: |
+ ResponseAction Run() override; |
// Instead of returning the value set by easyUnlockPrivate.setPermitAccess, |
// return the permit access used by the native CryptAuthEnrollmentManager. |
- void ReturnPermitAccessForExperiment(); |
+ ResponseAction GetPermitAccessForExperiment(); |
DISALLOW_COPY_AND_ASSIGN(EasyUnlockPrivateGetPermitAccessFunction); |
}; |
class EasyUnlockPrivateClearPermitAccessFunction |
- : public SyncExtensionFunction { |
+ : public UIThreadExtensionFunction { |
public: |
DECLARE_EXTENSION_FUNCTION("easyUnlockPrivate.clearPermitAccess", |
EASYUNLOCKPRIVATE_CLEARPERMITACCESS) |
@@ -275,13 +277,14 @@ class EasyUnlockPrivateClearPermitAccessFunction |
private: |
~EasyUnlockPrivateClearPermitAccessFunction() override; |
- // SyncExtensionFunction: |
- bool RunSync() override; |
+ // ExtensionFunction: |
+ ResponseAction Run() override; |
DISALLOW_COPY_AND_ASSIGN(EasyUnlockPrivateClearPermitAccessFunction); |
}; |
-class EasyUnlockPrivateSetRemoteDevicesFunction : public SyncExtensionFunction { |
+class EasyUnlockPrivateSetRemoteDevicesFunction |
+ : public UIThreadExtensionFunction { |
public: |
DECLARE_EXTENSION_FUNCTION("easyUnlockPrivate.setRemoteDevices", |
EASYUNLOCKPRIVATE_SETREMOTEDEVICES) |
@@ -290,8 +293,8 @@ class EasyUnlockPrivateSetRemoteDevicesFunction : public SyncExtensionFunction { |
private: |
~EasyUnlockPrivateSetRemoteDevicesFunction() override; |
- // SyncExtensionFunction: |
- bool RunSync() override; |
+ // ExtensionFunction: |
+ ResponseAction Run() override; |
DISALLOW_COPY_AND_ASSIGN(EasyUnlockPrivateSetRemoteDevicesFunction); |
}; |
@@ -361,8 +364,8 @@ class EasyUnlockPrivateGetSignInChallengeFunction : |
DISALLOW_COPY_AND_ASSIGN(EasyUnlockPrivateGetSignInChallengeFunction); |
}; |
-class EasyUnlockPrivateTrySignInSecretFunction : |
- public SyncExtensionFunction { |
+class EasyUnlockPrivateTrySignInSecretFunction |
+ : public UIThreadExtensionFunction { |
public: |
DECLARE_EXTENSION_FUNCTION("easyUnlockPrivate.trySignInSecret", |
EASYUNLOCKPRIVATE_TRYSIGNINSECRET) |
@@ -371,13 +374,13 @@ class EasyUnlockPrivateTrySignInSecretFunction : |
private: |
~EasyUnlockPrivateTrySignInSecretFunction() override; |
- // SyncExtensionFunction: |
- bool RunSync() override; |
+ // ExtensionFunction: |
+ ResponseAction Run() override; |
DISALLOW_COPY_AND_ASSIGN(EasyUnlockPrivateTrySignInSecretFunction); |
}; |
-class EasyUnlockPrivateGetUserInfoFunction : public SyncExtensionFunction { |
+class EasyUnlockPrivateGetUserInfoFunction : public UIThreadExtensionFunction { |
public: |
DECLARE_EXTENSION_FUNCTION("easyUnlockPrivate.getUserInfo", |
EASYUNLOCKPRIVATE_GETUSERINFO) |
@@ -386,8 +389,8 @@ class EasyUnlockPrivateGetUserInfoFunction : public SyncExtensionFunction { |
private: |
~EasyUnlockPrivateGetUserInfoFunction() override; |
- // SyncExtensionFunction: |
- bool RunSync() override; |
+ // ExtensionFunction: |
+ ResponseAction Run() override; |
DISALLOW_COPY_AND_ASSIGN(EasyUnlockPrivateGetUserInfoFunction); |
}; |
@@ -411,7 +414,8 @@ class EasyUnlockPrivateGetConnectionInfoFunction |
DISALLOW_COPY_AND_ASSIGN(EasyUnlockPrivateGetConnectionInfoFunction); |
}; |
-class EasyUnlockPrivateShowErrorBubbleFunction : public SyncExtensionFunction { |
+class EasyUnlockPrivateShowErrorBubbleFunction |
+ : public UIThreadExtensionFunction { |
public: |
DECLARE_EXTENSION_FUNCTION("easyUnlockPrivate.showErrorBubble", |
EASYUNLOCKPRIVATE_SHOWERRORBUBBLE) |
@@ -420,13 +424,14 @@ class EasyUnlockPrivateShowErrorBubbleFunction : public SyncExtensionFunction { |
private: |
~EasyUnlockPrivateShowErrorBubbleFunction() override; |
- // SyncExtensionFunction: |
- bool RunSync() override; |
+ // ExtensionFunction: |
+ ResponseAction Run() override; |
DISALLOW_COPY_AND_ASSIGN(EasyUnlockPrivateShowErrorBubbleFunction); |
}; |
-class EasyUnlockPrivateHideErrorBubbleFunction : public SyncExtensionFunction { |
+class EasyUnlockPrivateHideErrorBubbleFunction |
+ : public UIThreadExtensionFunction { |
public: |
DECLARE_EXTENSION_FUNCTION("easyUnlockPrivate.hideErrorBubble", |
EASYUNLOCKPRIVATE_HIDEERRORBUBBLE) |
@@ -435,14 +440,14 @@ class EasyUnlockPrivateHideErrorBubbleFunction : public SyncExtensionFunction { |
private: |
~EasyUnlockPrivateHideErrorBubbleFunction() override; |
- // SyncExtensionFunction: |
- bool RunSync() override; |
+ // ExtensionFunction: |
+ ResponseAction Run() override; |
DISALLOW_COPY_AND_ASSIGN(EasyUnlockPrivateHideErrorBubbleFunction); |
}; |
class EasyUnlockPrivateSetAutoPairingResultFunction |
- : public SyncExtensionFunction { |
+ : public UIThreadExtensionFunction { |
public: |
DECLARE_EXTENSION_FUNCTION("easyUnlockPrivate.setAutoPairingResult", |
EASYUNLOCKPRIVATE_SETAUTOPAIRINGRESULT) |
@@ -451,8 +456,8 @@ class EasyUnlockPrivateSetAutoPairingResultFunction |
private: |
~EasyUnlockPrivateSetAutoPairingResultFunction() override; |
- // SyncExtensionFunction: |
- bool RunSync() override; |
+ // ExtensionFunction: |
+ ResponseAction Run() override; |
DISALLOW_COPY_AND_ASSIGN(EasyUnlockPrivateSetAutoPairingResultFunction); |
}; |
@@ -492,7 +497,7 @@ class EasyUnlockPrivateFindSetupConnectionFunction |
}; |
class EasyUnlockPrivateSetupConnectionStatusFunction |
- : public SyncExtensionFunction { |
+ : public UIThreadExtensionFunction { |
public: |
DECLARE_EXTENSION_FUNCTION("easyUnlockPrivate.setupConnectionStatus", |
EASYUNLOCKPRIVATE_SETUPCONNECTIONSTATUS) |
@@ -501,14 +506,14 @@ class EasyUnlockPrivateSetupConnectionStatusFunction |
private: |
~EasyUnlockPrivateSetupConnectionStatusFunction() override; |
- // SyncExtensionFunction: |
- bool RunSync() override; |
+ // ExtensionFunction: |
+ ResponseAction Run() override; |
DISALLOW_COPY_AND_ASSIGN(EasyUnlockPrivateSetupConnectionStatusFunction); |
}; |
class EasyUnlockPrivateSetupConnectionDisconnectFunction |
- : public SyncExtensionFunction { |
+ : public UIThreadExtensionFunction { |
public: |
DECLARE_EXTENSION_FUNCTION("easyUnlockPrivate.setupConnectionDisconnect", |
EASYUNLOCKPRIVATE_SETUPCONNECTIONDISCONNECT) |
@@ -517,14 +522,14 @@ class EasyUnlockPrivateSetupConnectionDisconnectFunction |
private: |
~EasyUnlockPrivateSetupConnectionDisconnectFunction() override; |
- // SyncExtensionFunction: |
- bool RunSync() override; |
+ // ExtensionFunction: |
+ ResponseAction Run() override; |
DISALLOW_COPY_AND_ASSIGN(EasyUnlockPrivateSetupConnectionDisconnectFunction); |
}; |
class EasyUnlockPrivateSetupConnectionSendFunction |
- : public SyncExtensionFunction { |
+ : public UIThreadExtensionFunction { |
public: |
DECLARE_EXTENSION_FUNCTION("easyUnlockPrivate.setupConnectionSend", |
EASYUNLOCKPRIVATE_SETUPCONNECTIONSEND) |
@@ -533,14 +538,14 @@ class EasyUnlockPrivateSetupConnectionSendFunction |
private: |
~EasyUnlockPrivateSetupConnectionSendFunction() override; |
- // SyncExtensionFunction: |
- bool RunSync() override; |
+ // ExtensionFunction: |
+ ResponseAction Run() override; |
DISALLOW_COPY_AND_ASSIGN(EasyUnlockPrivateSetupConnectionSendFunction); |
}; |
class EasyUnlockPrivateSetupConnectionGetDeviceAddressFunction |
- : public SyncExtensionFunction { |
+ : public UIThreadExtensionFunction { |
public: |
DECLARE_EXTENSION_FUNCTION( |
"easyUnlockPrivate.setupConnectionGetDeviceAddress", |
@@ -550,8 +555,8 @@ class EasyUnlockPrivateSetupConnectionGetDeviceAddressFunction |
private: |
~EasyUnlockPrivateSetupConnectionGetDeviceAddressFunction() override; |
- // SyncExtensionFunction: |
- bool RunSync() override; |
+ // ExtensionFunction: |
+ ResponseAction Run() override; |
DISALLOW_COPY_AND_ASSIGN( |
EasyUnlockPrivateSetupConnectionGetDeviceAddressFunction); |