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

Side by Side Diff: webkit/common/webkit_common.gyp

Issue 298293010: Move resource_devtools_info from webkit/ to content/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 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 'enable_wexit_time_destructors': 1, 7 'enable_wexit_time_destructors': 1,
8 'chromium_code': 1 8 'chromium_code': 1
9 }, 9 },
10 'targets': [ 10 'targets': [
(...skipping 23 matching lines...) Expand all
34 34
35 'include_dirs': [ 35 'include_dirs': [
36 '<(INTERMEDIATE_DIR)', 36 '<(INTERMEDIATE_DIR)',
37 '<(SHARED_INTERMEDIATE_DIR)/ui', 37 '<(SHARED_INTERMEDIATE_DIR)/ui',
38 '<(SHARED_INTERMEDIATE_DIR)/webkit', 38 '<(SHARED_INTERMEDIATE_DIR)/webkit',
39 ], 39 ],
40 40
41 'sources': [ 41 'sources': [
42 'data_element.cc', 42 'data_element.cc',
43 'data_element.h', 43 'data_element.h',
44 'resource_devtools_info.cc',
45 'resource_devtools_info.h',
46 'resource_type.cc', 44 'resource_type.cc',
47 'resource_type.h', 45 'resource_type.h',
48 'webkit_common_export.h', 46 'webkit_common_export.h',
49 'webpreferences.cc', 47 'webpreferences.cc',
50 'webpreferences.h', 48 'webpreferences.h',
51 ], 49 ],
52 50
53 'conditions': [ 51 'conditions': [
54 ['use_aura==1 and use_x11==1', { 52 ['use_aura==1 and use_x11==1', {
55 'dependencies': [ 53 'dependencies': [
56 '<(DEPTH)/build/linux/system.gyp:xcursor', 54 '<(DEPTH)/build/linux/system.gyp:xcursor',
57 ], 55 ],
58 }], 56 }],
59 ['OS=="mac"', { 57 ['OS=="mac"', {
60 'link_settings': { 58 'link_settings': {
61 'libraries': [ 59 'libraries': [
62 '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework', 60 '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework',
63 ], 61 ],
64 }, 62 },
65 }], 63 }],
66 ['OS=="win"', { 64 ['OS=="win"', {
67 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 65 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
68 'msvs_disabled_warnings': [ 4800, 4267 ], 66 'msvs_disabled_warnings': [ 4800, 4267 ],
69 }], 67 }],
70 ], 68 ],
71 }, 69 },
72 ], 70 ],
73 } 71 }
OLDNEW
« content/common/resource_messages.h ('K') | « webkit/common/resource_devtools_info.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698