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

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: rebase Created 5 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 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 301 matching lines...) Expand 10 before | Expand all | Expand 10 after
312 'net_utility_services', 312 'net_utility_services',
313 '../third_party/mojo/mojo_edk.gyp:mojo_system_impl', 313 '../third_party/mojo/mojo_edk.gyp:mojo_system_impl',
314 ], 314 ],
315 }, { # else 315 }, { # else
316 'sources!': [ 316 'sources!': [
317 'dns/host_resolver_mojo_unittest.cc', 317 'dns/host_resolver_mojo_unittest.cc',
318 'dns/mojo_host_resolver_impl_unittest.cc', 318 'dns/mojo_host_resolver_impl_unittest.cc',
319 'proxy/load_state_change_coalescer_unittest.cc', 319 'proxy/load_state_change_coalescer_unittest.cc',
320 'proxy/mojo_proxy_resolver_factory_impl_unittest.cc', 320 'proxy/mojo_proxy_resolver_factory_impl_unittest.cc',
321 'proxy/mojo_proxy_resolver_impl_unittest.cc', 321 'proxy/mojo_proxy_resolver_impl_unittest.cc',
322 'proxy/proxy_resolver_error_observer_mojo_unittest.cc',
322 'proxy/proxy_resolver_mojo_unittest.cc', 323 'proxy/proxy_resolver_mojo_unittest.cc',
323 'proxy/proxy_service_mojo_unittest.cc', 324 'proxy/proxy_service_mojo_unittest.cc',
324 ], 325 ],
325 }, 326 },
326 ], 327 ],
327 328
328 [ 'enable_mdns != 1', { 329 [ 'enable_mdns != 1', {
329 'sources!' : [ 330 'sources!' : [
330 'dns/mdns_cache_unittest.cc', 331 'dns/mdns_cache_unittest.cc',
331 'dns/mdns_client_unittest.cc', 332 'dns/mdns_client_unittest.cc',
(...skipping 584 matching lines...) Expand 10 before | Expand all | Expand 10 after
916 'type': 'static_library', 917 'type': 'static_library',
917 'sources': [ 918 'sources': [
918 'dns/host_resolver_mojo.cc', 919 'dns/host_resolver_mojo.cc',
919 'dns/host_resolver_mojo.h', 920 'dns/host_resolver_mojo.h',
920 'proxy/load_state_change_coalescer.cc', 921 'proxy/load_state_change_coalescer.cc',
921 'proxy/load_state_change_coalescer.h', 922 'proxy/load_state_change_coalescer.h',
922 'proxy/mojo_proxy_resolver_factory_impl.cc', 923 'proxy/mojo_proxy_resolver_factory_impl.cc',
923 'proxy/mojo_proxy_resolver_factory_impl.h', 924 'proxy/mojo_proxy_resolver_factory_impl.h',
924 'proxy/mojo_proxy_resolver_impl.cc', 925 'proxy/mojo_proxy_resolver_impl.cc',
925 'proxy/mojo_proxy_resolver_impl.h', 926 'proxy/mojo_proxy_resolver_impl.h',
927 'proxy/proxy_resolver_error_observer_mojo.cc',
928 'proxy/proxy_resolver_error_observer_mojo.h',
926 ], 929 ],
927 'dependencies': [ 930 'dependencies': [
928 'mojo_type_converters', 931 'mojo_type_converters',
929 'net_interfaces', 932 'net_interfaces',
930 'net_with_v8', 933 'net_with_v8',
931 '../mojo/mojo_base.gyp:mojo_url_type_converters', 934 '../mojo/mojo_base.gyp:mojo_url_type_converters',
932 '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings', 935 '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
933 ], 936 ],
934 }, 937 },
935 { 938 {
(...skipping 592 matching lines...) Expand 10 before | Expand all | Expand 10 after
1528 '../build/isolate.gypi', 1531 '../build/isolate.gypi',
1529 ], 1532 ],
1530 'sources': [ 1533 'sources': [
1531 'net_unittests.isolate', 1534 'net_unittests.isolate',
1532 ], 1535 ],
1533 }, 1536 },
1534 ], 1537 ],
1535 }], 1538 }],
1536 ], 1539 ],
1537 } 1540 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698