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

Side by Side Diff: ui/aura/aura.gyp

Issue 9773024: This patch implements Chromium's Aura gesture recognizer in terms of utouch-grail and utouch-frame … (Closed) Base URL: https://src.chromium.org/svn/trunk/src/
Patch Set: Created 8 years, 8 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
« no previous file with comments | « content/utility/utility_thread_impl.cc ('k') | ui/aura/event.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 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'targets': [ 9 'targets': [
10 { 10 {
11 'target_name': 'aura', 11 'target_name': 'aura',
12 'type': '<(component)', 12 'type': '<(component)',
13 'dependencies': [ 13 'dependencies': [
14 '../../base/base.gyp:base', 14 '../../base/base.gyp:base',
15 '../../base/base.gyp:base_i18n', 15 '../../base/base.gyp:base_i18n',
16 '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyna mic_annotations', 16 '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyna mic_annotations',
17 #'../../build/linux/system.gyp:utouch_frame',
18 #'../../build/linux/system.gyp:utouch_grail',
19 '../../third_party/utouch-frame/utouch-frame.gyp:utouch-frame',
20 '../../third_party/utouch-grail/utouch-grail.gyp:utouch-grail',
17 '../../skia/skia.gyp:skia', 21 '../../skia/skia.gyp:skia',
18 '../gfx/compositor/compositor.gyp:compositor', 22 '../gfx/compositor/compositor.gyp:compositor',
19 '../ui.gyp:gfx_resources', 23 '../ui.gyp:gfx_resources',
20 '../ui.gyp:ui', 24 '../ui.gyp:ui',
21 '../ui.gyp:ui_resources', 25 '../ui.gyp:ui_resources',
22 ], 26 ],
23 'defines': [ 27 'defines': [
24 'AURA_IMPLEMENTATION', 28 'AURA_IMPLEMENTATION',
25 ], 29 ],
26 'sources': [ 30 'sources': [
(...skipping 28 matching lines...) Expand all
55 'env.h', 59 'env.h',
56 'env_observer.h', 60 'env_observer.h',
57 'event.cc', 61 'event.cc',
58 'event.h', 62 'event.h',
59 'event_filter.h', 63 'event_filter.h',
60 'event_mac.mm', 64 'event_mac.mm',
61 'event_mac.h', 65 'event_mac.h',
62 'focus_manager.h', 66 'focus_manager.h',
63 'gestures/gesture_configuration.cc', 67 'gestures/gesture_configuration.cc',
64 'gestures/gesture_configuration.h', 68 'gestures/gesture_configuration.h',
65 'gestures/gesture_recognizer.h', 69 » 'gestures/gesture_point.cc',»
66 'gestures/gesture_recognizer_aura.cc', 70 » 'gestures/gesture_point.h',
71 » 'gestures/gesture_recognizer.h',»
72 » 'gestures/gesture_recognizer_aura.cc',
67 'gestures/gesture_recognizer_aura.h', 73 'gestures/gesture_recognizer_aura.h',
68 'gestures/gesture_point.cc', 74 'gestures/gesture_recognizer_grail.cc',
69 'gestures/gesture_point.h', 75 'gestures/gesture_recognizer_grail.h',
70 'gestures/velocity_calculator.cc', 76 » 'gestures/gesture_sequence.cc',»
71 'gestures/velocity_calculator.h', 77 » 'gestures/gesture_sequence.h',
72 'gestures/gesture_sequence.cc', 78 » 'gestures/velocity_calculator.cc',»
73 'gestures/gesture_sequence.h', 79 » 'gestures/velocity_calculator.h',»
74 'layout_manager.cc', 80 'layout_manager.cc',
75 'layout_manager.h', 81 'layout_manager.h',
76 'root_window_host.h', 82 'root_window_host.h',
77 'root_window_host_linux.cc', 83 'root_window_host_linux.cc',
78 'root_window_host_linux.h', 84 'root_window_host_linux.h',
79 'root_window_host_mac.h', 85 'root_window_host_mac.h',
80 'root_window_host_mac.mm', 86 'root_window_host_mac.mm',
81 'root_window_host_win.cc', 87 'root_window_host_win.cc',
82 'root_window_host_win.h', 88 'root_window_host_win.h',
83 'root_window_mac.h', 89 'root_window_mac.h',
84 'root_window_mac.mm', 90 'root_window_mac.mm',
85 'root_window_view_mac.h', 91 'root_window_view_mac.h',
86 'root_window_view_mac.mm', 92 'root_window_view_mac.mm',
87 'root_window.cc', 93 'root_window.cc',
88 'root_window.h', 94 'root_window.h',
89 'screen_aura.cc', 95 'screen_aura.cc',
90 'screen_aura.h', 96 'screen_aura.h',
91 'window.cc', 97 'window.cc',
92 'window.h', 98 'window.h',
93 'window_delegate.h', 99 'window_delegate.h',
94 'window_observer.h', 100 'window_observer.h',
95 ], 101 ],
96 'conditions': [ 102 'conditions': [
97 ['OS=="mac"', { 103 ['OS=="mac"', {
98 'sources/': [ 104 'sources/': [
99 ['exclude', 'client/dispatcher_client.cc'], 105 ['exclude', 'client/dispatcher_client.cc'],
100 ['exclude', 'client/dispatcher_client.h'], 106 ['exclude', 'client/dispatcher_client.h'],
101 ], 107 ],
102 }], 108 }],
109 ['use_utouch==1', {
110 'sources!': [
111 'gestures/gesture_point.cc',
112 'gestures/gesture_point.h',
113 'gestures/gesture_recognizer_aura.cc',
114 'gestures/gesture_recognizer_aura.h',
115 'gestures/gesture_sequence.cc',
116 'gestures/gesture_sequence.h',
117 'gestures/velocity_calculator.cc',
118 'gestures/velocity_calculator.h',
119 ],
120 'defines': [
121 'USE_UTOUCH',
122 ],
123
124 }, { #use_utouch!=1
125 'dependencies!': [
126 '../../third_party/utouch-frame/utouch-frame.gyp:utouch-frame',
127 '../../third_party/utouch-grail/utouch-grail.gyp:utouch-grail',
128 ],
129 'sources!': [
130 'gestures/gesture_recognizer_grail.cc',
131 'gestures/gesture_recognizer_grail.h',
132 ],
133 }],
103 ], 134 ],
104 }, 135 },
105 { 136 {
106 'target_name': 'test_support_aura', 137 'target_name': 'test_support_aura',
107 'type': 'static_library', 138 'type': 'static_library',
108 'dependencies': [ 139 'dependencies': [
109 '../../skia/skia.gyp:skia', 140 '../../skia/skia.gyp:skia',
110 '../../testing/gtest.gyp:gtest', 141 '../../testing/gtest.gyp:gtest',
111 '../ui.gyp:ui', 142 '../ui.gyp:ui',
112 'aura', 143 'aura',
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 '../ui.gyp:gfx_resources', 203 '../ui.gyp:gfx_resources',
173 '../ui.gyp:ui', 204 '../ui.gyp:ui',
174 '../ui.gyp:ui_resources', 205 '../ui.gyp:ui_resources',
175 'test_support_aura', 206 'test_support_aura',
176 'aura', 207 'aura',
177 ], 208 ],
178 'include_dirs': [ 209 'include_dirs': [
179 '..', 210 '..',
180 ], 211 ],
181 'sources': [ 212 'sources': [
213 'gestures/gesture_recognizer_grail_unittest.cc',
182 'gestures/gesture_recognizer_unittest.cc', 214 'gestures/gesture_recognizer_unittest.cc',
183 'gestures/velocity_calculator_unittest.cc', 215 'gestures/velocity_calculator_unittest.cc',
184 'test/run_all_unittests.cc', 216 'test/run_all_unittests.cc',
185 'test/test_suite.cc', 217 'test/test_suite.cc',
186 'test/test_suite.h', 218 'test/test_suite.h',
187 'root_window_unittest.cc', 219 'root_window_unittest.cc',
188 'event_filter_unittest.cc', 220 'event_filter_unittest.cc',
189 'event_unittest.cc', 221 'event_unittest.cc',
190 'window_unittest.cc', 222 'window_unittest.cc',
191 '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc', 223 '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc',
192 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc', 224 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
193 ], 225 ],
194 'conditions': [ 226 'conditions': [
195 # osmesa GL implementation is used on linux. 227 # osmesa GL implementation is used on linux.
196 ['OS=="linux"', { 228 ['OS=="linux"', {
197 'dependencies': [ 229 'dependencies': [
198 '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa', 230 '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa',
199 ], 231 ],
200 }], 232 }],
233 ['use_utouch==1', {
234 'sources!': [
235 'gestures/gesture_recognizer_unittest.cc',
236 'gestures/velocity_calculator_unittest.cc',
237 ],
238 'defines': [
239 'USE_UTOUCH',
240 ],
241 'dependencies': [
242 # '../../build/linux/system.gyp:utouch_frame',
243 '../../third_party/utouch-frame/utouch-frame.gyp:utouch-frame',
244 '../../third_party/utouch-grail/utouch-grail.gyp:utouch-grail',
245 # '../../build/linux/system.gyp:utouch_grail',
246 '../../third_party/xorg-gtest/xorg-gtest.gyp:xorg-gtest',
247 ],
248 }, # use_utouch != 1
249 {
250 'sources!': [
251 'gestures/gesture_recognizer_grail_unittest.cc',
252 ],
253 }],
201 ], 254 ],
202 }, 255 },
203 ], 256 ],
204 } 257 }
OLDNEW
« no previous file with comments | « content/utility/utility_thread_impl.cc ('k') | ui/aura/event.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698