| Index: components/data_reduction_proxy/browser/data_reduction_proxy_params.h
|
| diff --git a/components/data_reduction_proxy/browser/data_reduction_proxy_params.h b/components/data_reduction_proxy/browser/data_reduction_proxy_params.h
|
| index f9ec3a308c7e1da00ae33ad9a3cd18d1bedf2d47..c486b95dc0e8a81f27f09c8377f4c0f241a2ef74 100644
|
| --- a/components/data_reduction_proxy/browser/data_reduction_proxy_params.h
|
| +++ b/components/data_reduction_proxy/browser/data_reduction_proxy_params.h
|
| @@ -51,8 +51,9 @@ class DataReductionProxyParams {
|
| static const unsigned int kAllowed = (1 << 0);
|
| static const unsigned int kFallbackAllowed = (1 << 1);
|
| static const unsigned int kAlternativeAllowed = (1 << 2);
|
| - static const unsigned int kPromoAllowed = (1 << 3);
|
| - static const unsigned int kHoldback = (1 << 4);
|
| + static const unsigned int kAlternativeFallbackAllowed = (1 << 3);
|
| + static const unsigned int kPromoAllowed = (1 << 4);
|
| + static const unsigned int kHoldback = (1 << 5);
|
|
|
| typedef std::vector<GURL> DataReductionProxyList;
|
|
|
| @@ -209,6 +210,12 @@ class DataReductionProxyParams {
|
| return alt_allowed_;
|
| }
|
|
|
| + // Returns true if the alternative fallback data reduction proxy
|
| + // configuration may be used.
|
| + bool alternative_fallback_allowed() const {
|
| + return alt_fallback_allowed_;
|
| + }
|
| +
|
| // Returns true if the data reduction proxy promo may be shown.
|
| // This is idependent of whether the data reduction proxy is allowed.
|
| // TODO(bengr): maybe tie to whether proxy is allowed.
|
| @@ -241,7 +248,10 @@ class DataReductionProxyParams {
|
| // Initialize the values of the proxies, and probe URL, from command
|
| // line flags and preprocessor constants, and check that there are
|
| // corresponding definitions for the allowed configurations.
|
| - bool Init(bool allowed, bool fallback_allowed, bool alt_allowed);
|
| + bool Init(bool allowed,
|
| + bool fallback_allowed,
|
| + bool alt_allowed,
|
| + bool alt_fallback_allowed);
|
|
|
| // Initialize the values of the proxies, and probe URL from command
|
| // line flags and preprocessor constants.
|
| @@ -283,6 +293,7 @@ class DataReductionProxyParams {
|
| bool allowed_;
|
| bool fallback_allowed_;
|
| bool alt_allowed_;
|
| + bool alt_fallback_allowed_;
|
| bool promo_allowed_;
|
| bool holdback_;
|
|
|
|
|