Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef COMPONENTS_DATA_REDUCTION_PROXY_BROWSER_DATA_REDUCTION_PROXY_PARAMS_H_ | 5 #ifndef COMPONENTS_DATA_REDUCTION_PROXY_BROWSER_DATA_REDUCTION_PROXY_PARAMS_H_ |
| 6 #define COMPONENTS_DATA_REDUCTION_PROXY_BROWSER_DATA_REDUCTION_PROXY_PARAMS_H_ | 6 #define COMPONENTS_DATA_REDUCTION_PROXY_BROWSER_DATA_REDUCTION_PROXY_PARAMS_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 #include <utility> | 9 #include <utility> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 69 // bypassed or disabled. If |kAlternativeAllowed| then an alternative proxy | 69 // bypassed or disabled. If |kAlternativeAllowed| then an alternative proxy |
| 70 // configuration is allowed to be used. This alternative configuration would | 70 // configuration is allowed to be used. This alternative configuration would |
| 71 // replace the primary and fallback proxy configurations if enabled. Finally | 71 // replace the primary and fallback proxy configurations if enabled. Finally |
| 72 // if |kPromoAllowed|, the client may show a promotion for the data reduction | 72 // if |kPromoAllowed|, the client may show a promotion for the data reduction |
| 73 // proxy. | 73 // proxy. |
| 74 // | 74 // |
| 75 // A standard configuration has a primary proxy, and a fallback proxy for | 75 // A standard configuration has a primary proxy, and a fallback proxy for |
| 76 // HTTP traffic. The alternative configuration has a different primary and | 76 // HTTP traffic. The alternative configuration has a different primary and |
| 77 // fallback proxy for HTTP traffic, and an SSL proxy. | 77 // fallback proxy for HTTP traffic, and an SSL proxy. |
| 78 | 78 |
| 79 DataReductionProxyParams(int flags); | 79 DataReductionProxyParams(int flags); |
|
willchan no longer on Chromium
2014/07/29 00:26:56
This should be explicit.
bengr
2014/07/29 21:29:53
Done.
| |
| 80 | 80 |
| 81 DataReductionProxyParams(const DataReductionProxyParams& params); | |
|
willchan no longer on Chromium
2014/07/29 00:26:57
What makes this necessary? We generally avoid copy
bengr
2014/07/29 21:29:52
I can remove this, but I think it would require ha
willchan no longer on Chromium
2014/07/31 22:31:34
We chatted offline about this. The style guide pro
| |
| 82 | |
| 81 virtual ~DataReductionProxyParams(); | 83 virtual ~DataReductionProxyParams(); |
| 82 | 84 |
| 83 // Returns true if a data reduction proxy was used for the given |request|. | 85 // Returns true if a data reduction proxy was used for the given |request|. |
| 84 // If true, |proxy_servers.first| will contain the name of the proxy that was | 86 // If true, |proxy_servers.first| will contain the name of the proxy that was |
| 85 // used. |proxy_servers.second| will contain the name of the data reduction | 87 // used. |proxy_servers.second| will contain the name of the data reduction |
| 86 // proxy server that would be used if |proxy_server.first| is bypassed, if one | 88 // proxy server that would be used if |proxy_server.first| is bypassed, if one |
| 87 // exists. |proxy_servers| can be NULL if the caller isn't interested in its | 89 // exists. |proxy_servers| can be NULL if the caller isn't interested in its |
| 88 // values. | 90 // values. |
| 89 virtual bool WasDataReductionProxyUsed( | 91 virtual bool WasDataReductionProxyUsed( |
| 90 const net::URLRequest* request, | 92 const net::URLRequest* request, |
| (...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 212 GURL probe_url_; | 214 GURL probe_url_; |
| 213 GURL warmup_url_; | 215 GURL warmup_url_; |
| 214 | 216 |
| 215 bool allowed_; | 217 bool allowed_; |
| 216 const bool fallback_allowed_; | 218 const bool fallback_allowed_; |
| 217 bool alt_allowed_; | 219 bool alt_allowed_; |
| 218 const bool promo_allowed_; | 220 const bool promo_allowed_; |
| 219 bool holdback_; | 221 bool holdback_; |
| 220 | 222 |
| 221 bool configured_on_command_line_; | 223 bool configured_on_command_line_; |
| 222 | |
| 223 DISALLOW_COPY_AND_ASSIGN(DataReductionProxyParams); | |
| 224 }; | 224 }; |
| 225 | 225 |
| 226 } // namespace data_reduction_proxy | 226 } // namespace data_reduction_proxy |
| 227 #endif // COMPONENTS_DATA_REDUCTION_PROXY_BROWSER_DATA_REDUCTION_PROXY_PARAMS_H _ | 227 #endif // COMPONENTS_DATA_REDUCTION_PROXY_BROWSER_DATA_REDUCTION_PROXY_PARAMS_H _ |
| OLD | NEW |