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

Side by Side Diff: webkit/glue/webkit_glue.gypi

Issue 20188002: Move websocketstreamhandle_bridge.h out of webkit/glue/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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 | « webkit/child/websocketstreamhandle_impl.cc ('k') | webkit/glue/websocketstreamhandle_bridge.h » ('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) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 'target_defaults': { 6 'target_defaults': {
7 # Disable narrowing-conversion-in-initialization-list warnings in that we 7 # Disable narrowing-conversion-in-initialization-list warnings in that we
8 # do not want to fix it in data file "webcursor_gtk_data.h". 8 # do not want to fix it in data file "webcursor_gtk_data.h".
9 'cflags+': ['-Wno-narrowing'], 9 'cflags+': ['-Wno-narrowing'],
10 'cflags_cc+': ['-Wno-narrowing'], 10 'cflags_cc+': ['-Wno-narrowing'],
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 '../child/web_discardable_memory_impl.h', 57 '../child/web_discardable_memory_impl.h',
58 '../child/webfallbackthemeengine_impl.cc', 58 '../child/webfallbackthemeengine_impl.cc',
59 '../child/webfallbackthemeengine_impl.h', 59 '../child/webfallbackthemeengine_impl.h',
60 '../child/webkit_child_export.h', 60 '../child/webkit_child_export.h',
61 '../child/webkit_child_helpers.cc', 61 '../child/webkit_child_helpers.cc',
62 '../child/webkit_child_helpers.h', 62 '../child/webkit_child_helpers.h',
63 '../child/webkitplatformsupport_child_impl.cc', 63 '../child/webkitplatformsupport_child_impl.cc',
64 '../child/webkitplatformsupport_child_impl.h', 64 '../child/webkitplatformsupport_child_impl.h',
65 '../child/webkitplatformsupport_impl.cc', 65 '../child/webkitplatformsupport_impl.cc',
66 '../child/webkitplatformsupport_impl.h', 66 '../child/webkitplatformsupport_impl.h',
67 '../child/websocketstreamhandle_bridge.h',
67 '../child/websocketstreamhandle_delegate.h', 68 '../child/websocketstreamhandle_delegate.h',
68 '../child/websocketstreamhandle_impl.cc', 69 '../child/websocketstreamhandle_impl.cc',
69 '../child/websocketstreamhandle_impl.h', 70 '../child/websocketstreamhandle_impl.h',
70 '../child/webthemeengine_impl_android.cc', 71 '../child/webthemeengine_impl_android.cc',
71 '../child/webthemeengine_impl_android.h', 72 '../child/webthemeengine_impl_android.h',
72 '../child/webthemeengine_impl_default.cc', 73 '../child/webthemeengine_impl_default.cc',
73 '../child/webthemeengine_impl_default.h', 74 '../child/webthemeengine_impl_default.h',
74 '../child/webthemeengine_impl_mac.cc', 75 '../child/webthemeengine_impl_mac.cc',
75 '../child/webthemeengine_impl_mac.h', 76 '../child/webthemeengine_impl_mac.h',
76 '../child/webthemeengine_impl_win.cc', 77 '../child/webthemeengine_impl_win.cc',
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 ], 156 ],
156 'sources': [ 157 'sources': [
157 'network_list_observer.h', 158 'network_list_observer.h',
158 'simple_webmimeregistry_impl.cc', 159 'simple_webmimeregistry_impl.cc',
159 'simple_webmimeregistry_impl.h', 160 'simple_webmimeregistry_impl.h',
160 'webfileutilities_impl.cc', 161 'webfileutilities_impl.cc',
161 'webfileutilities_impl.h', 162 'webfileutilities_impl.h',
162 'webkit_glue.cc', 163 'webkit_glue.cc',
163 'webkit_glue.h', 164 'webkit_glue.h',
164 'webkit_glue_export.h', 165 'webkit_glue_export.h',
165 'websocketstreamhandle_bridge.h',
166 ], 166 ],
167 # When glue is a dependency, it needs to be a hard dependency. 167 # When glue is a dependency, it needs to be a hard dependency.
168 # Dependents may rely on files generated by this target or one of its 168 # Dependents may rely on files generated by this target or one of its
169 # own hard dependencies. 169 # own hard dependencies.
170 'hard_dependency': 1, 170 'hard_dependency': 1,
171 'conditions': [ 171 'conditions': [
172 ['toolkit_uses_gtk == 1', { 172 ['toolkit_uses_gtk == 1', {
173 'dependencies': [ 173 'dependencies': [
174 '<(DEPTH)/build/linux/system.gyp:gtk', 174 '<(DEPTH)/build/linux/system.gyp:gtk',
175 ], 175 ],
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
236 'variables': { 236 'variables': {
237 'jni_gen_package': 'webkit', 237 'jni_gen_package': 'webkit',
238 'input_java_class': 'android/widget/OverScroller.class', 238 'input_java_class': 'android/widget/OverScroller.class',
239 }, 239 },
240 'includes': [ '../../build/jar_file_jni_generator.gypi' ], 240 'includes': [ '../../build/jar_file_jni_generator.gypi' ],
241 }, 241 },
242 ], 242 ],
243 }], 243 }],
244 ], 244 ],
245 } 245 }
OLDNEW
« no previous file with comments | « webkit/child/websocketstreamhandle_impl.cc ('k') | webkit/glue/websocketstreamhandle_bridge.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698