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

Side by Side Diff: webkit/child/webkit_child.gyp

Issue 182383015: Merge weburlrequest_extradata_impl.cc/h into content/child/request_extra_data.cc/h (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: address all feedback Created 6 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 | Annotate | Revision Log
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 'conditions': [ 9 'conditions': [
10 ['OS=="android"', 10 ['OS=="android"',
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 'sources': [ 57 'sources': [
58 'ftp_directory_listing_response_delegate.cc', 58 'ftp_directory_listing_response_delegate.cc',
59 'ftp_directory_listing_response_delegate.h', 59 'ftp_directory_listing_response_delegate.h',
60 'multipart_response_delegate.cc', 60 'multipart_response_delegate.cc',
61 'multipart_response_delegate.h', 61 'multipart_response_delegate.h',
62 'resource_loader_bridge.cc', 62 'resource_loader_bridge.cc',
63 'resource_loader_bridge.h', 63 'resource_loader_bridge.h',
64 'touch_fling_gesture_curve.cc', 64 'touch_fling_gesture_curve.cc',
65 'touch_fling_gesture_curve.h', 65 'touch_fling_gesture_curve.h',
66 'webkit_child_export.h', 66 'webkit_child_export.h',
67 'weburlrequest_extradata_impl.cc',
68 'weburlrequest_extradata_impl.h',
69 'weburlresponse_extradata_impl.cc', 67 'weburlresponse_extradata_impl.cc',
70 'weburlresponse_extradata_impl.h', 68 'weburlresponse_extradata_impl.h',
71 ], 69 ],
72 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 70 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
73 'msvs_disabled_warnings': [ 4267 ], 71 'msvs_disabled_warnings': [ 4267 ],
74 'conditions': [ 72 'conditions': [
75 ['OS=="mac"', 73 ['OS=="mac"',
76 { 74 {
77 'link_settings': { 75 'link_settings': {
78 'libraries': [ 76 'libraries': [
79 '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework', 77 '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework',
80 ], 78 ],
81 }, 79 },
82 } 80 }
83 ], 81 ],
84 ['OS=="android"', 82 ['OS=="android"',
85 { 83 {
86 'dependencies': [ 84 'dependencies': [
87 'overscroller_jni_headers', 85 'overscroller_jni_headers',
88 ], 86 ],
89 } 87 }
90 ], 88 ],
91 ], 89 ],
92 }, 90 },
93 ], 91 ],
94 } 92 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698