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

Side by Side Diff: net/net.gyp

Issue 3047052: chromeos: 1st draft of ProxyConfigService for chromeos... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 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
« no previous file with comments | « chrome/test/testing_profile.h ('k') | net/proxy/proxy_service.cc » ('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 (c) 2010 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2010 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 'targets': [ 9 'targets': [
10 { 10 {
(...skipping 590 matching lines...) Expand 10 before | Expand all | Expand 10 after
601 ], 601 ],
602 'export_dependent_settings': [ 602 'export_dependent_settings': [
603 '../base/base.gyp:base', 603 '../base/base.gyp:base',
604 ], 604 ],
605 'conditions': [ 605 'conditions': [
606 ['javascript_engine=="v8"', { 606 ['javascript_engine=="v8"', {
607 'dependencies': [ 607 'dependencies': [
608 '../v8/tools/gyp/v8.gyp:v8', 608 '../v8/tools/gyp/v8.gyp:v8',
609 ], 609 ],
610 }], 610 }],
611 ['chromeos==1', {
612 'sources!': [
613 'proxy/proxy_config_service_linux.cc',
614 'proxy/proxy_config_service_linux.h',
615 ],
616 }],
611 [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', { 617 [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', {
612 'dependencies': [ 618 'dependencies': [
613 '../build/linux/system.gyp:gconf', 619 '../build/linux/system.gyp:gconf',
614 '../build/linux/system.gyp:gdk', 620 '../build/linux/system.gyp:gdk',
615 '../build/linux/system.gyp:nss', 621 '../build/linux/system.gyp:nss',
616 ], 622 ],
617 }, 623 },
618 { # else: OS is not in the above list 624 { # else: OS is not in the above list
619 'sources!': [ 625 'sources!': [
620 'ocsp/nss_ocsp.cc', 626 'ocsp/nss_ocsp.cc',
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
817 'url_request/view_cache_helper_unittest.cc', 823 'url_request/view_cache_helper_unittest.cc',
818 'websockets/websocket_frame_handler_unittest.cc', 824 'websockets/websocket_frame_handler_unittest.cc',
819 'websockets/websocket_handshake_draft75_unittest.cc', 825 'websockets/websocket_handshake_draft75_unittest.cc',
820 'websockets/websocket_handshake_handler_unittest.cc', 826 'websockets/websocket_handshake_handler_unittest.cc',
821 'websockets/websocket_handshake_unittest.cc', 827 'websockets/websocket_handshake_unittest.cc',
822 'websockets/websocket_job_unittest.cc', 828 'websockets/websocket_job_unittest.cc',
823 'websockets/websocket_throttle_unittest.cc', 829 'websockets/websocket_throttle_unittest.cc',
824 'websockets/websocket_unittest.cc', 830 'websockets/websocket_unittest.cc',
825 ], 831 ],
826 'conditions': [ 832 'conditions': [
833 ['chromeos==1', {
834 'sources!': [
835 'proxy/proxy_config_service_linux_unittest.cc',
836 ],
837 }],
827 [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', { 838 [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', {
828 'dependencies': [ 839 'dependencies': [
829 '../build/linux/system.gyp:gtk', 840 '../build/linux/system.gyp:gtk',
830 '../build/linux/system.gyp:nss', 841 '../build/linux/system.gyp:nss',
831 ], 842 ],
832 'sources!': [ 843 'sources!': [
833 'base/sdch_filter_unittest.cc', 844 'base/sdch_filter_unittest.cc',
834 ], 845 ],
835 }, 846 },
836 { # else: OS is not in the above list 847 { # else: OS is not in the above list
(...skipping 316 matching lines...) Expand 10 before | Expand all | Expand 10 after
1153 ], 1164 ],
1154 }], 1165 }],
1155 ], 1166 ],
1156 } 1167 }
1157 1168
1158 # Local Variables: 1169 # Local Variables:
1159 # tab-width:2 1170 # tab-width:2
1160 # indent-tabs-mode:nil 1171 # indent-tabs-mode:nil
1161 # End: 1172 # End:
1162 # vim: set expandtab tabstop=2 shiftwidth=2: 1173 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « chrome/test/testing_profile.h ('k') | net/proxy/proxy_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698