diff options
| author | bengr@chromium.org <bengr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-30 13:06:23 +0000 |
|---|---|---|
| committer | bengr@chromium.org <bengr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-30 13:06:23 +0000 |
| commit | 85e57d4d0241a31881536262ead36f0aff90b4fc (patch) | |
| tree | 05f0a17b5e3587e6620546261d3e09ddd8e01976 /build/common.gypi | |
| parent | 4fd1906bf3b27103da6ff7f46e6528268bc1ba2f (diff) | |
| download | chromium_src-85e57d4d0241a31881536262ead36f0aff90b4fc.zip chromium_src-85e57d4d0241a31881536262ead36f0aff90b4fc.tar.gz chromium_src-85e57d4d0241a31881536262ead36f0aff90b4fc.tar.bz2 | |
Added alternative configuration for the data reduction proxy
Added a second configuration that can support two http proxies and one https proxy. In the process, added a new DataReductionProxyParams object to encapsulate static configuration details and made DataReductionSettingsAndroid a BrowserKeyedContextService.
BUG=370039
Review URL: https://codereview.chromium.org/286013002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@273810 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/common.gypi')
| -rw-r--r-- | build/common.gypi | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/build/common.gypi b/build/common.gypi index 0e9cdea..a18f871 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -550,6 +550,9 @@ 'spdy_proxy_auth_property%' : '', 'spdy_proxy_auth_value%' : '', 'data_reduction_proxy_probe_url%' : '', + 'data_reduction_proxy_ssl_origin%' : '', + 'data_reduction_proxy_alt_origin%' : '', + 'data_reduction_proxy_alt_fallback_origin%' : '', 'enable_mdns%' : 0, 'enable_service_discovery%': 0, 'enable_wifi_bootstrapping%': 0, @@ -1099,6 +1102,9 @@ 'spdy_proxy_auth_property%': '<(spdy_proxy_auth_property)', 'spdy_proxy_auth_value%': '<(spdy_proxy_auth_value)', 'data_reduction_proxy_probe_url%': '<(data_reduction_proxy_probe_url)', + 'data_reduction_proxy_ssl_origin%' : '<(data_reduction_proxy_ssl_origin)', + 'data_reduction_proxy_alt_origin%' : '<(data_reduction_proxy_alt_origin)', + 'data_reduction_proxy_alt_fallback_origin%' : '<(data_reduction_proxy_alt_fallback_origin)', 'enable_mdns%' : '<(enable_mdns)', 'enable_service_discovery%' : '<(enable_service_discovery)', 'enable_wifi_bootstrapping%': '<(enable_wifi_bootstrapping)', @@ -2718,6 +2724,18 @@ 'defines': [ 'DATA_REDUCTION_PROXY_PROBE_URL="<(data_reduction_proxy_probe_url)"'], }], + ['data_reduction_proxy_ssl_origin != ""', { + 'defines': [ + 'DATA_REDUCTION_PROXY_SSL_ORIGIN="<(data_reduction_proxy_ssl_origin)"'], + }], + ['data_reduction_proxy_alt_origin != ""', { + 'defines': [ + 'DATA_REDUCTION_PROXY_ALT_ORIGIN="<(data_reduction_proxy_alt_origin)"'], + }], + ['data_reduction_proxy_alt_fallback_origin != ""', { + 'defines': [ + 'DATA_REDUCTION_PROXY_ALT_FALLBACK_ORIGIN="<(data_reduction_proxy_alt_fallback_origin)"'], + }], ['enable_mdns==1', { 'defines': ['ENABLE_MDNS=1'], }], |