Chromium Code Reviews| Index: google_apis/google_api_keys.cc |
| diff --git a/google_apis/google_api_keys.cc b/google_apis/google_api_keys.cc |
| index f879979bc78a49baafabf0ac192f96bb68c95ea0..eb0ceec49e0dfb50bd5cdd81f93caf6564f09bc8 100644 |
| --- a/google_apis/google_api_keys.cc |
| +++ b/google_apis/google_api_keys.cc |
| @@ -180,6 +180,13 @@ class APIKeyCache { |
| return client_secrets_[client]; |
| } |
| + std::string GetSpdyProxyAuthValue() { |
| +#if defined(SPDY_PROXY_AUTH_VALUE) |
| + return SPDY_PROXY_AUTH_VALUE; |
| +#endif |
| + return ""; |
|
bengr
2014/10/10 23:36:47
return std::string()
Not at Google. Contact bengr
2014/10/11 00:00:24
Done.
|
| + } |
| + |
| private: |
| // Gets a value for a key. In priority order, this will be the value |
| // provided via a command-line switch, the value provided via an |
| @@ -260,6 +267,10 @@ std::string GetOAuth2ClientSecret(OAuth2Client client) { |
| return g_api_key_cache.Get().GetClientSecret(client); |
| } |
| +std::string GetSpdyProxyAuthValue() { |
| + return g_api_key_cache.Get().GetSpdyProxyAuthValue(); |
| +} |
| + |
| bool IsGoogleChromeAPIKeyUsed() { |
| #if defined(GOOGLE_CHROME_BUILD) || defined(USE_OFFICIAL_GOOGLE_API_KEYS) |
| return true; |