Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(140)

Side by Side Diff: net/net.gyp

Issue 160510: Better match IE's proxy settings.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix merge conflict Created 11 years, 4 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 # Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2009 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 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'includes': [ 9 'includes': [
10 '../build/common.gypi', 10 '../build/common.gypi',
(...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after
244 'http/http_util.h', 244 'http/http_util.h',
245 'http/http_vary_data.cc', 245 'http/http_vary_data.cc',
246 'http/http_vary_data.h', 246 'http/http_vary_data.h',
247 'http/http_version.h', 247 'http/http_version.h',
248 'http/md4.cc', 248 'http/md4.cc',
249 'http/md4.h', 249 'http/md4.h',
250 'http/partial_data.cc', 250 'http/partial_data.cc',
251 'http/partial_data.h', 251 'http/partial_data.h',
252 'ocsp/nss_ocsp.cc', 252 'ocsp/nss_ocsp.cc',
253 'ocsp/nss_ocsp.h', 253 'ocsp/nss_ocsp.h',
254 'proxy/init_proxy_resolver.cc',
255 'proxy/init_proxy_resolver.h',
254 'proxy/proxy_config.cc', 256 'proxy/proxy_config.cc',
255 'proxy/proxy_config.h', 257 'proxy/proxy_config.h',
256 'proxy/proxy_config_service.h', 258 'proxy/proxy_config_service.h',
257 'proxy/proxy_config_service_fixed.h', 259 'proxy/proxy_config_service_fixed.h',
258 'proxy/proxy_config_service_linux.cc', 260 'proxy/proxy_config_service_linux.cc',
259 'proxy/proxy_config_service_linux.h', 261 'proxy/proxy_config_service_linux.h',
260 'proxy/proxy_config_service_win.cc', 262 'proxy/proxy_config_service_win.cc',
261 'proxy/proxy_config_service_win.h', 263 'proxy/proxy_config_service_win.h',
262 'proxy/proxy_info.cc', 264 'proxy/proxy_info.cc',
263 'proxy/proxy_info.h', 265 'proxy/proxy_info.h',
(...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after
488 'http/http_byte_range_unittest.cc', 490 'http/http_byte_range_unittest.cc',
489 'http/http_cache_unittest.cc', 491 'http/http_cache_unittest.cc',
490 'http/http_chunked_decoder_unittest.cc', 492 'http/http_chunked_decoder_unittest.cc',
491 'http/http_network_layer_unittest.cc', 493 'http/http_network_layer_unittest.cc',
492 'http/http_network_transaction_unittest.cc', 494 'http/http_network_transaction_unittest.cc',
493 'http/http_response_headers_unittest.cc', 495 'http/http_response_headers_unittest.cc',
494 'http/http_transaction_unittest.cc', 496 'http/http_transaction_unittest.cc',
495 'http/http_transaction_unittest.h', 497 'http/http_transaction_unittest.h',
496 'http/http_util_unittest.cc', 498 'http/http_util_unittest.cc',
497 'http/http_vary_data_unittest.cc', 499 'http/http_vary_data_unittest.cc',
500 'proxy/init_proxy_resolver_unittest.cc',
498 'proxy/proxy_config_service_linux_unittest.cc', 501 'proxy/proxy_config_service_linux_unittest.cc',
499 'proxy/proxy_config_service_win_unittest.cc', 502 'proxy/proxy_config_service_win_unittest.cc',
500 'proxy/proxy_config_unittest.cc', 503 'proxy/proxy_config_unittest.cc',
501 'proxy/proxy_list_unittest.cc', 504 'proxy/proxy_list_unittest.cc',
502 'proxy/proxy_resolver_js_bindings_unittest.cc', 505 'proxy/proxy_resolver_js_bindings_unittest.cc',
503 'proxy/proxy_resolver_v8_unittest.cc', 506 'proxy/proxy_resolver_v8_unittest.cc',
504 'proxy/proxy_script_fetcher_unittest.cc', 507 'proxy/proxy_script_fetcher_unittest.cc',
505 'proxy/proxy_server_unittest.cc', 508 'proxy/proxy_server_unittest.cc',
506 'proxy/proxy_service_unittest.cc', 509 'proxy/proxy_service_unittest.cc',
507 'proxy/single_threaded_proxy_resolver_unittest.cc', 510 'proxy/single_threaded_proxy_resolver_unittest.cc',
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after
722 'sources': [ 725 'sources': [
723 'tools/dump_cache/dump_cache.cc', 726 'tools/dump_cache/dump_cache.cc',
724 'tools/dump_cache/dump_files.cc', 727 'tools/dump_cache/dump_files.cc',
725 'tools/dump_cache/upgrade.cc', 728 'tools/dump_cache/upgrade.cc',
726 ], 729 ],
727 }, 730 },
728 ], 731 ],
729 }], 732 }],
730 ], 733 ],
731 } 734 }
OLDNEW
« no previous file with comments | « chrome/browser/net/resolve_proxy_msg_helper_unittest.cc ('k') | net/proxy/init_proxy_resolver.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698