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

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

Issue 10332145: aura/ash split: Moves RootWindowEventFilter and InputMethodEventFilter to ui/aura/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Moved to ui/aura/shared/ Created 8 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
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 {
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 'client/user_gesture_client.h', 50 'client/user_gesture_client.h',
51 'client/visibility_client.cc', 51 'client/visibility_client.cc',
52 'client/visibility_client.h', 52 'client/visibility_client.h',
53 'client/window_move_client.cc', 53 'client/window_move_client.cc',
54 'client/window_move_client.h', 54 'client/window_move_client.h',
55 'client/window_types.h', 55 'client/window_types.h',
56 'desktop/desktop_activation_client.cc', 56 'desktop/desktop_activation_client.cc',
57 'desktop/desktop_activation_client.h', 57 'desktop/desktop_activation_client.h',
58 'desktop/desktop_dispatcher_client.cc', 58 'desktop/desktop_dispatcher_client.cc',
59 'desktop/desktop_dispatcher_client.h', 59 'desktop/desktop_dispatcher_client.h',
60 'desktop/desktop_root_window_event_filter.cc',
61 'desktop/desktop_root_window_event_filter.h',
62 'desktop/desktop_screen.h', 60 'desktop/desktop_screen.h',
63 'desktop/desktop_screen_win.cc', 61 'desktop/desktop_screen_win.cc',
64 'desktop/desktop_screen_win.h', 62 'desktop/desktop_screen_win.h',
65 'desktop/desktop_screen_x11.cc', 63 'desktop/desktop_screen_x11.cc',
66 'desktop/desktop_stacking_client.cc', 64 'desktop/desktop_stacking_client.cc',
67 'desktop/desktop_stacking_client.h', 65 'desktop/desktop_stacking_client.h',
68 'dispatcher_linux.cc', 66 'dispatcher_linux.cc',
69 'dispatcher_linux.h', 67 'dispatcher_linux.h',
70 'dispatcher_win.cc', 68 'dispatcher_win.cc',
71 'env.cc', 69 'env.cc',
(...skipping 19 matching lines...) Expand all
91 'root_window_host_mac.h', 89 'root_window_host_mac.h',
92 'root_window_host_mac.mm', 90 'root_window_host_mac.mm',
93 'root_window_host_win.cc', 91 'root_window_host_win.cc',
94 'root_window_host_win.h', 92 'root_window_host_win.h',
95 'root_window_mac.h', 93 'root_window_mac.h',
96 'root_window_mac.mm', 94 'root_window_mac.mm',
97 'root_window_view_mac.h', 95 'root_window_view_mac.h',
98 'root_window_view_mac.mm', 96 'root_window_view_mac.mm',
99 'root_window.cc', 97 'root_window.cc',
100 'root_window.h', 98 'root_window.h',
99 'shared/input_method_event_filter.cc',
100 'shared/input_method_event_filter.h',
101 'shared/root_window_event_filter.cc',
102 'shared/root_window_event_filter.h',
101 'single_monitor_manager.cc', 103 'single_monitor_manager.cc',
102 'single_monitor_manager.h', 104 'single_monitor_manager.h',
103 'ui_controls_win.cc', 105 'ui_controls_win.cc',
104 'ui_controls_x11.cc', 106 'ui_controls_x11.cc',
105 'window.cc', 107 'window.cc',
106 'window.h', 108 'window.h',
107 'window_delegate.h', 109 'window_delegate.h',
108 'window_observer.h', 110 'window_observer.h',
109 ], 111 ],
110 'conditions': [ 112 'conditions': [
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 '<(repack_path)', 184 '<(repack_path)',
183 '<@(pak_inputs)', 185 '<@(pak_inputs)',
184 ], 186 ],
185 'outputs': [ 187 'outputs': [
186 '<(PRODUCT_DIR)/test_support_aura_resources.pak', 188 '<(PRODUCT_DIR)/test_support_aura_resources.pak',
187 ], 189 ],
188 'action': ['python', '<(repack_path)', '<@(_outputs)', 190 'action': ['python', '<(repack_path)', '<@(_outputs)',
189 '<@(pak_inputs)'], 191 '<@(pak_inputs)'],
190 }, 192 },
191 ], 193 ],
192 }, 194 },
193 { 195 {
194 'target_name': 'aura_demo', 196 'target_name': 'aura_demo',
195 'type': 'executable', 197 'type': 'executable',
196 'dependencies': [ 198 'dependencies': [
197 '../../base/base.gyp:base', 199 '../../base/base.gyp:base',
198 '../../base/base.gyp:base_i18n', 200 '../../base/base.gyp:base_i18n',
199 '../../skia/skia.gyp:skia', 201 '../../skia/skia.gyp:skia',
200 '../../third_party/icu/icu.gyp:icui18n', 202 '../../third_party/icu/icu.gyp:icui18n',
201 '../../third_party/icu/icu.gyp:icuuc', 203 '../../third_party/icu/icu.gyp:icuuc',
202 '../compositor/compositor.gyp:compositor', 204 '../compositor/compositor.gyp:compositor',
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
234 ], 236 ],
235 'include_dirs': [ 237 'include_dirs': [
236 '..', 238 '..',
237 ], 239 ],
238 'sources': [ 240 'sources': [
239 'gestures/gesture_recognizer_unittest.cc', 241 'gestures/gesture_recognizer_unittest.cc',
240 'test/run_all_unittests.cc', 242 'test/run_all_unittests.cc',
241 'test/test_suite.cc', 243 'test/test_suite.cc',
242 'test/test_suite.h', 244 'test/test_suite.h',
243 'root_window_unittest.cc', 245 'root_window_unittest.cc',
246 'shared/input_method_event_filter_unittest.cc',
244 'event_filter_unittest.cc', 247 'event_filter_unittest.cc',
245 'event_unittest.cc', 248 'event_unittest.cc',
246 'window_unittest.cc', 249 'window_unittest.cc',
247 '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc', 250 '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc',
248 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc', 251 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
249 ], 252 ],
250 'conditions': [ 253 'conditions': [
251 # osmesa GL implementation is used on linux. 254 # osmesa GL implementation is used on linux.
252 ['OS=="linux"', { 255 ['OS=="linux"', {
253 'dependencies': [ 256 'dependencies': [
254 '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa', 257 '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa',
255 ], 258 ],
256 }], 259 }],
257 ], 260 ],
258 }, 261 },
259 ], 262 ],
260 } 263 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698