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

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

Issue 267973002: Revert of Remove webkit's ResourceLoaderBridge interface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 | Annotate | Revision Log
« no previous file with comments | « webkit/child/resource_loader_bridge.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 'include_dirs': [ 49 'include_dirs': [
50 # For JNI generated header. 50 # For JNI generated header.
51 '<(SHARED_INTERMEDIATE_DIR)/webkit', 51 '<(SHARED_INTERMEDIATE_DIR)/webkit',
52 ], 52 ],
53 # This target exports a hard dependency because dependent targets may 53 # This target exports a hard dependency because dependent targets may
54 # include the header generated above. 54 # include the header generated above.
55 'hard_dependency': 1, 55 'hard_dependency': 1,
56 'sources': [ 56 'sources': [
57 'multipart_response_delegate.cc', 57 'multipart_response_delegate.cc',
58 'multipart_response_delegate.h', 58 'multipart_response_delegate.h',
59 'resource_loader_bridge.cc',
60 'resource_loader_bridge.h',
59 'webkit_child_export.h', 61 'webkit_child_export.h',
60 'weburlresponse_extradata_impl.cc', 62 'weburlresponse_extradata_impl.cc',
61 'weburlresponse_extradata_impl.h', 63 'weburlresponse_extradata_impl.h',
62 ], 64 ],
63 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 65 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
64 'msvs_disabled_warnings': [ 4267 ], 66 'msvs_disabled_warnings': [ 4267 ],
65 'conditions': [ 67 'conditions': [
66 ['OS=="mac"', 68 ['OS=="mac"',
67 { 69 {
68 'link_settings': { 70 'link_settings': {
69 'libraries': [ 71 'libraries': [
70 '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework', 72 '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework',
71 ], 73 ],
72 }, 74 },
73 } 75 }
74 ], 76 ],
75 ['OS=="android"', 77 ['OS=="android"',
76 { 78 {
77 'dependencies': [ 79 'dependencies': [
78 'overscroller_jni_headers', 80 'overscroller_jni_headers',
79 ], 81 ],
80 } 82 }
81 ], 83 ],
82 ], 84 ],
83 }, 85 },
84 ], 86 ],
85 } 87 }
OLDNEW
« no previous file with comments | « webkit/child/resource_loader_bridge.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698