summaryrefslogtreecommitdiffstats
path: root/chrome/chrome_browser.gypi
diff options
context:
space:
mode:
authorbattre@chromium.org <battre@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-16 14:47:21 +0000
committerbattre@chromium.org <battre@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-16 14:47:21 +0000
commitdb0e86dde97e9b1ced5cba1c6a6c0cf29179db1b (patch)
tree05b12196fd6fb91c63e554029eccc87016f741fb /chrome/chrome_browser.gypi
parentb8dedffcd73166ff70163162a713a2c0407953d6 (diff)
downloadchromium_src-db0e86dde97e9b1ced5cba1c6a6c0cf29179db1b.zip
chromium_src-db0e86dde97e9b1ced5cba1c6a6c0cf29179db1b.tar.gz
chromium_src-db0e86dde97e9b1ced5cba1c6a6c0cf29179db1b.tar.bz2
This is an extension of http://codereview.chromium.org/6280018 that provides a proxy configuration which respects command line parameters and policies
This was committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=78228, iyengar asked to commit again after fixing trunk. BUG=67232,70732 TEST=Start chrome, observe two PROXY_CONFIG_CHANGED events in about:net-internals (if you are on a corporate network with PAC configurations), observe that everything behaves as usual. In particular the https://www.google.com/searchdomaincheck?format=domain&type=chrome request should not fail as it uses the new system URLRequestContext. Review URL: http://codereview.chromium.org/6292017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78362 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_browser.gypi')
-rw-r--r--chrome/chrome_browser.gypi2
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index df6cbe7..eadddd4 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -1351,6 +1351,8 @@
'browser/net/predictor_api.h',
'browser/net/pref_proxy_config_service.cc',
'browser/net/pref_proxy_config_service.h',
+ 'browser/net/proxy_service_factory.cc',
+ 'browser/net/proxy_service_factory.h',
'browser/net/quoted_printable.cc',
'browser/net/quoted_printable.h',
'browser/net/referrer.cc',