build/common.gypi - Issue 286013002: Added alternative configuration for the data reduction proxy

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: build/common.gypi

Issue 286013002: Added alternative configuration for the data reduction proxy (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: DCHECK fix Created 6 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « android_webview/native/aw_contents_statics.cc ('k') | chrome/android/java/src/org/chromium/chrome/browser/net/spdyproxy/DataReductionProxySettings.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: build/common.gypi

diff --git a/build/common.gypi b/build/common.gypi

index 0e9cdea0e66f2aabed661709c88fefc7db7fdf71..a18f8716ea503a1d61eb6c256f9bdf99b8f7d25b 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'],

}],