diff options
| author |  Yuchen Zeng <zyc@google.com> | 2016-10-24 16:17:40 -0700 |
|---|---|---|
| committer | Yuchen Zeng <zyc@google.com> | 2016-10-24 16:17:40 -0700 |
| commit | 8e386a6999fc9d4344b628e9a8a781622bd1bd8b (patch) | |
| tree | 496522f813673c6053c9d5debae739d77081fe53 /include | |
| parent | d30699c7bebfa3cb0ad4ba1eac99284a52b7859f (diff) | |
| parent | 3cb89bcf4bf5f010d861e01d88eaee046221fbd4 (diff) | |
Merge remote-tracking branch 'upstream/master' into reflection_header
Diffstat (limited to 'include')
| -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: |