Chromium Code Reviews| Index: chrome/browser/extensions/api/networking_private/networking_private_service_client.h |
| diff --git a/chrome/browser/extensions/api/networking_private/networking_private_service_client.h b/chrome/browser/extensions/api/networking_private/networking_private_service_client.h |
| index 78a35a29e86e4f212accfc8b347242c62206e19b..dad69a6ded407566fa134889f3b694438051078a 100644 |
| --- a/chrome/browser/extensions/api/networking_private/networking_private_service_client.h |
| +++ b/chrome/browser/extensions/api/networking_private/networking_private_service_client.h |
| @@ -17,6 +17,7 @@ |
| #include "base/supports_user_data.h" |
| #include "base/threading/sequenced_worker_pool.h" |
| #include "base/values.h" |
| +#include "chrome/browser/extensions/api/networking_private/networking_private_credentials_getter.h" |
| #include "components/browser_context_keyed_service/browser_context_keyed_service.h" |
| #include "components/wifi/wifi_service.h" |
| #include "content/public/browser/browser_thread.h" |
| @@ -56,6 +57,10 @@ class NetworkingPrivateServiceClient |
| bool* verified, |
| std::string* error) = 0; |
| + virtual void VerifyAndEncryptCredentials( |
| + scoped_ptr<base::ListValue> args, |
| + NetworkingPrivateCredentialsGetter* credentials_getter) = 0; |
| + |
| virtual void VerifyAndEncryptData(scoped_ptr<base::ListValue> args, |
| std::string* base64_encoded_ciphertext, |
| std::string* error) = 0; |
| @@ -181,6 +186,13 @@ class NetworkingPrivateServiceClient |
| const CryptoErrorCallback& error_callback); |
| // Verify that Chromecast provides valid cryptographically signed properties. |
| + // If valid, then get WiFi credentials from the system and encrypt them using |
| + // Chromecast's public key. |
|
tbarzic
2014/02/07 19:25:00
remove Chromecast from the comment (unless the met
mef
2014/02/07 19:53:31
It is as 'Verify' step of all Verify* methods expe
tbarzic
2014/02/07 22:43:02
ack
|
| + void VerifyAndEncryptCredentials(scoped_ptr<base::ListValue> args, |
| + const StringResultCallback& callback, |
| + const CryptoErrorCallback& error_callback); |
| + |
| + // Verify that Chromecast provides valid cryptographically signed properties. |
| // If valid, then encrypt data using Chromecast's public key. |
| void VerifyAndEncryptData(scoped_ptr<base::ListValue> args, |
| const StringResultCallback& callback, |
| @@ -216,8 +228,11 @@ class NetworkingPrivateServiceClient |
| BoolResultCallback verify_destination_callback; |
| StringResultCallback verify_and_encrypt_data_callback; |
| + StringResultCallback verify_and_encrypt_credentials_callback; |
| CryptoErrorCallback crypto_error_callback; |
| + scoped_ptr<NetworkingPrivateCredentialsGetter> credentials_getter; |
|
tbarzic
2014/02/07 22:43:02
NetworkingPrivateCredentialsGetter is ref counted
mef
2014/02/11 23:20:05
Done. You are absolutely correct. I couldn't inher
|
| + |
| ServiceCallbacksID id; |
| }; |
| typedef IDMap<ServiceCallbacks, IDMapOwnPointer> ServiceCallbacksMap; |
| @@ -246,6 +261,9 @@ class NetworkingPrivateServiceClient |
| void AfterVerifyAndEncryptData(ServiceCallbacksID callback_id, |
| const std::string* result, |
| const std::string* error); |
| + void AfterVerifyAndEncryptCredentials(ServiceCallbacksID callback_id, |
| + const std::string& encrypted_data, |
| + const std::string& error); |
| void OnNetworksChangedEventOnUIThread( |
| const WiFiService::NetworkGuidList& network_guid_list); |