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

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

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

Powered by Google App Engine
This is Rietveld 408576698