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

Side by Side Diff: net/net.gyp

Issue 1017453005: Add support for ProxyResolverErrorObserver to ProxyResolverMojo. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 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
OLDNEW
1 # Copyright 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 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 'linux_link_kerberos%': 0, 9 'linux_link_kerberos%': 0,
10 'conditions': [ 10 'conditions': [
(...skipping 278 matching lines...) Expand 10 before | Expand all | Expand 10 after
289 'net_utility_services', 289 'net_utility_services',
290 '../third_party/mojo/mojo_edk.gyp:mojo_system_impl', 290 '../third_party/mojo/mojo_edk.gyp:mojo_system_impl',
291 ], 291 ],
292 }, { # else 292 }, { # else
293 'sources!': [ 293 'sources!': [
294 'dns/host_resolver_mojo_unittest.cc', 294 'dns/host_resolver_mojo_unittest.cc',
295 'dns/mojo_host_resolver_impl_unittest.cc', 295 'dns/mojo_host_resolver_impl_unittest.cc',
296 'proxy/load_state_change_coalescer_unittest.cc', 296 'proxy/load_state_change_coalescer_unittest.cc',
297 'proxy/mojo_proxy_resolver_factory_impl_unittest.cc', 297 'proxy/mojo_proxy_resolver_factory_impl_unittest.cc',
298 'proxy/mojo_proxy_resolver_impl_unittest.cc', 298 'proxy/mojo_proxy_resolver_impl_unittest.cc',
299 'proxy/proxy_resolver_error_observer_mojo_unittest.cc',
299 'proxy/proxy_resolver_mojo_unittest.cc', 300 'proxy/proxy_resolver_mojo_unittest.cc',
300 'proxy/proxy_service_mojo_unittest.cc', 301 'proxy/proxy_service_mojo_unittest.cc',
301 ], 302 ],
302 }, 303 },
303 ], 304 ],
304 305
305 [ 'enable_mdns != 1', { 306 [ 'enable_mdns != 1', {
306 'sources!' : [ 307 'sources!' : [
307 'dns/mdns_cache_unittest.cc', 308 'dns/mdns_cache_unittest.cc',
308 'dns/mdns_client_unittest.cc', 309 'dns/mdns_client_unittest.cc',
(...skipping 575 matching lines...) Expand 10 before | Expand all | Expand 10 after
884 'type': 'static_library', 885 'type': 'static_library',
885 'sources': [ 886 'sources': [
886 'dns/host_resolver_mojo.cc', 887 'dns/host_resolver_mojo.cc',
887 'dns/host_resolver_mojo.h', 888 'dns/host_resolver_mojo.h',
888 'proxy/load_state_change_coalescer.cc', 889 'proxy/load_state_change_coalescer.cc',
889 'proxy/load_state_change_coalescer.h', 890 'proxy/load_state_change_coalescer.h',
890 'proxy/mojo_proxy_resolver_factory_impl.cc', 891 'proxy/mojo_proxy_resolver_factory_impl.cc',
891 'proxy/mojo_proxy_resolver_factory_impl.h', 892 'proxy/mojo_proxy_resolver_factory_impl.h',
892 'proxy/mojo_proxy_resolver_impl.cc', 893 'proxy/mojo_proxy_resolver_impl.cc',
893 'proxy/mojo_proxy_resolver_impl.h', 894 'proxy/mojo_proxy_resolver_impl.h',
895 'proxy/proxy_resolver_error_observer_mojo.cc',
896 'proxy/proxy_resolver_error_observer_mojo.h',
894 ], 897 ],
895 'dependencies': [ 898 'dependencies': [
896 'mojo_type_converters', 899 'mojo_type_converters',
897 'net_interfaces', 900 'net_interfaces',
898 'net_with_v8', 901 'net_with_v8',
899 '../mojo/mojo_base.gyp:mojo_url_type_converters', 902 '../mojo/mojo_base.gyp:mojo_url_type_converters',
900 '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings', 903 '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
901 ], 904 ],
902 }, 905 },
903 { 906 {
(...skipping 576 matching lines...) Expand 10 before | Expand all | Expand 10 after
1480 '../build/isolate.gypi', 1483 '../build/isolate.gypi',
1481 ], 1484 ],
1482 'sources': [ 1485 'sources': [
1483 'net_unittests.isolate', 1486 'net_unittests.isolate',
1484 ], 1487 ],
1485 }, 1488 },
1486 ], 1489 ],
1487 }], 1490 }],
1488 ], 1491 ],
1489 } 1492 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698