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

Side by Side Diff: net/net.gypi

Issue 1006643002: Plumb connection attempts from (non-proxy) ConnectJobs to HttpNetworkTransaction. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase, resolve conflict Created 5 years, 8 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
« no previous file with comments | « net/http/http_transaction_test_util.cc ('k') | net/socket/client_socket_handle.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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 # This file is shared between the regular GYP build, the NaCl GYP build, and 5 # This file is shared between the regular GYP build, the NaCl GYP build, and
6 # the GN build. For GN support, it must have no conditionals or anything like 6 # the GN build. For GN support, it must have no conditionals or anything like
7 # that beyond the simple one-level-deep dictionary of values. 7 # that beyond the simple one-level-deep dictionary of values.
8 { 8 {
9 'variables': { 9 'variables': {
10 # Subset of net source files that are compiled for NaCl (net_nacl target). 10 # Subset of net source files that are compiled for NaCl (net_nacl target).
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 'http/transport_security_state.cc', 123 'http/transport_security_state.cc',
124 'http/transport_security_state.h', 124 'http/transport_security_state.h',
125 'log/net_log.cc', 125 'log/net_log.cc',
126 'log/net_log.h', 126 'log/net_log.h',
127 'log/net_log_capture_mode.cc', 127 'log/net_log_capture_mode.cc',
128 'log/net_log_capture_mode.h', 128 'log/net_log_capture_mode.h',
129 'log/net_log_event_type_list.h', 129 'log/net_log_event_type_list.h',
130 'log/net_log_source_type_list.h', 130 'log/net_log_source_type_list.h',
131 'socket/client_socket_handle.cc', 131 'socket/client_socket_handle.cc',
132 'socket/client_socket_handle.h', 132 'socket/client_socket_handle.h',
133 'socket/connection_attempts.h',
133 'socket/next_proto.cc', 134 'socket/next_proto.cc',
134 'socket/next_proto.h', 135 'socket/next_proto.h',
135 'socket/socket.h', 136 'socket/socket.h',
136 'socket/ssl_client_socket.cc', 137 'socket/ssl_client_socket.cc',
137 'socket/ssl_client_socket.h', 138 'socket/ssl_client_socket.h',
138 'socket/ssl_client_socket_openssl.cc', 139 'socket/ssl_client_socket_openssl.cc',
139 'socket/ssl_client_socket_openssl.h', 140 'socket/ssl_client_socket_openssl.h',
140 'socket/ssl_client_socket_pool.cc', 141 'socket/ssl_client_socket_pool.cc',
141 'socket/ssl_client_socket_pool.h', 142 'socket/ssl_client_socket_pool.h',
142 'socket/ssl_socket.h', 143 'socket/ssl_socket.h',
(...skipping 1661 matching lines...) Expand 10 before | Expand all | Expand 10 after
1804 'base/mac/url_conversions_unittest.mm', 1805 'base/mac/url_conversions_unittest.mm',
1805 ], 1806 ],
1806 'net_docs_script': 'tools/net_docs/net_docs.py', 1807 'net_docs_script': 'tools/net_docs/net_docs.py',
1807 'net_docs_sources': [ 1808 'net_docs_sources': [
1808 'README.md', 1809 'README.md',
1809 'sdch/README.md', 1810 'sdch/README.md',
1810 ], 1811 ],
1811 'net_docs_output_dir': '<(PRODUCT_DIR)/net/docs', 1812 'net_docs_output_dir': '<(PRODUCT_DIR)/net/docs',
1812 } 1813 }
1813 } 1814 }
OLDNEW
« no previous file with comments | « net/http/http_transaction_test_util.cc ('k') | net/socket/client_socket_handle.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698