diff options
| author |  Sree Kuchibhotla <sreek@google.com> | 2016-10-24 16:18:58 -0700 |
|---|---|---|
| committer | Sree Kuchibhotla <sreek@google.com> | 2016-10-24 16:18:58 -0700 |
| commit | 91931195991d47a150a97bb600cb07d7c1de0286 (patch) | |
| tree | 3ba5f2e73735138eab9433ba0d95ddb179c000b7 /include/grpc++ | |
| parent | 3fc578345d32df35feee769b2ab64141db04b6f7 (diff) | |
| parent | 3cb89bcf4bf5f010d861e01d88eaee046221fbd4 (diff) | |
Merge branch 'master' into rpc_mgr
Diffstat (limited to 'include/grpc++')
| -rw-r--r-- | include/grpc++/security/credentials.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/grpc++/security/credentials.h b/include/grpc++/security/credentials.h index 5439244b02..59861b78d8 100644 --- a/include/grpc++/security/credentials.h +++ b/include/grpc++/security/credentials.h @@ -201,6 +201,9 @@ std::shared_ptr<CallCredentials> CompositeCallCredentials( /// Credentials for an unencrypted, unauthenticated channel std::shared_ptr<ChannelCredentials> InsecureChannelCredentials(); +/// Credentials for a channel using Cronet. +std::shared_ptr<ChannelCredentials> CronetChannelCredentials(void* engine); + // User defined metadata credentials. class MetadataCredentialsPlugin { public: |