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

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

Issue 11363124: Move DisplayManager and DisplayChangeObserverX11 from aura to ash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix rebase Created 8 years, 1 month 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 | « content/shell/shell_aura.cc ('k') | ui/aura/bench/bench_main.cc » ('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 {
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 'client/user_action_client.cc', 57 'client/user_action_client.cc',
58 'client/user_action_client.h', 58 'client/user_action_client.h',
59 'client/visibility_client.cc', 59 'client/visibility_client.cc',
60 'client/visibility_client.h', 60 'client/visibility_client.h',
61 'client/window_move_client.cc', 61 'client/window_move_client.cc',
62 'client/window_move_client.h', 62 'client/window_move_client.h',
63 'client/window_types.h', 63 'client/window_types.h',
64 'device_list_updater_aurax11.cc', 64 'device_list_updater_aurax11.cc',
65 'device_list_updater_aurax11.h', 65 'device_list_updater_aurax11.h',
66 'dispatcher_win.cc', 66 'dispatcher_win.cc',
67 'display_observer.cc', 67 'display_util.cc',
68 'display_observer.h', 68 'display_util.h',
69 'env.cc', 69 'env.cc',
70 'env.h', 70 'env.h',
71 'env_observer.h', 71 'env_observer.h',
72 'event_filter.cc', 72 'event_filter.cc',
73 'event_filter.h', 73 'event_filter.h',
74 'focus_change_observer.h', 74 'focus_change_observer.h',
75 'focus_manager.cc', 75 'focus_manager.cc',
76 'focus_manager.h', 76 'focus_manager.h',
77 'layout_manager.cc', 77 'layout_manager.cc',
78 'layout_manager.h', 78 'layout_manager.h',
79 'display_change_observer_x11.cc',
80 'display_change_observer_x11.h',
81 'display_manager.cc',
82 'display_manager.h',
83 'remote_root_window_host_win.cc', 79 'remote_root_window_host_win.cc',
84 'remote_root_window_host_win.h', 80 'remote_root_window_host_win.h',
85 'root_window_host.h', 81 'root_window_host.h',
86 'root_window_host_delegate.h', 82 'root_window_host_delegate.h',
87 'root_window_host_linux.cc', 83 'root_window_host_linux.cc',
88 'root_window_host_linux.h', 84 'root_window_host_linux.h',
89 'root_window_host_mac.h', 85 'root_window_host_mac.h',
90 'root_window_host_mac.mm', 86 'root_window_host_mac.mm',
91 'root_window_host_win.cc', 87 'root_window_host_win.cc',
92 'root_window_host_win.h', 88 'root_window_host_win.h',
93 'root_window_mac.h', 89 'root_window_mac.h',
94 'root_window_mac.mm', 90 'root_window_mac.mm',
95 'root_window_view_mac.h', 91 'root_window_view_mac.h',
96 'root_window_view_mac.mm', 92 'root_window_view_mac.mm',
97 'root_window.cc', 93 'root_window.cc',
98 'root_window.h', 94 'root_window.h',
99 'single_display_manager.cc',
100 'single_display_manager.h',
101 'ui_controls_win.cc', 95 'ui_controls_win.cc',
102 'ui_controls_x11.cc', 96 'ui_controls_x11.cc',
103 'window.cc', 97 'window.cc',
104 'window.h', 98 'window.h',
105 'window_delegate.cc', 99 'window_delegate.cc',
106 'window_delegate.h', 100 'window_delegate.h',
107 'window_observer.h', 101 'window_observer.h',
108 'window_tracker.cc', 102 'window_tracker.cc',
109 'window_tracker.h', 103 'window_tracker.h',
110 ], 104 ],
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 '../../base/base.gyp:base_i18n', 196 '../../base/base.gyp:base_i18n',
203 '../../skia/skia.gyp:skia', 197 '../../skia/skia.gyp:skia',
204 '../../third_party/icu/icu.gyp:icui18n', 198 '../../third_party/icu/icu.gyp:icui18n',
205 '../../third_party/icu/icu.gyp:icuuc', 199 '../../third_party/icu/icu.gyp:icuuc',
206 '../compositor/compositor.gyp:compositor', 200 '../compositor/compositor.gyp:compositor',
207 '../compositor/compositor.gyp:compositor_test_support', 201 '../compositor/compositor.gyp:compositor_test_support',
208 '../ui.gyp:ui', 202 '../ui.gyp:ui',
209 '../ui.gyp:ui_resources', 203 '../ui.gyp:ui_resources',
210 '../../ipc/ipc.gyp:ipc', 204 '../../ipc/ipc.gyp:ipc',
211 'aura', 205 'aura',
206 'test_support_aura',
212 ], 207 ],
213 'include_dirs': [ 208 'include_dirs': [
214 '..', 209 '..',
215 ], 210 ],
216 'sources': [ 211 'sources': [
217 'demo/demo_main.cc', 212 'demo/demo_main.cc',
218 ], 213 ],
219 }, 214 },
220 { 215 {
221 'target_name': 'aura_bench', 216 'target_name': 'aura_bench',
222 'type': 'executable', 217 'type': 'executable',
223 'dependencies': [ 218 'dependencies': [
224 '../../base/base.gyp:base', 219 '../../base/base.gyp:base',
225 '../../base/base.gyp:base_i18n', 220 '../../base/base.gyp:base_i18n',
226 '../../skia/skia.gyp:skia', 221 '../../skia/skia.gyp:skia',
227 '../../third_party/icu/icu.gyp:icui18n', 222 '../../third_party/icu/icu.gyp:icui18n',
228 '../../third_party/icu/icu.gyp:icuuc', 223 '../../third_party/icu/icu.gyp:icuuc',
229 '../compositor/compositor.gyp:compositor', 224 '../compositor/compositor.gyp:compositor',
230 '../compositor/compositor.gyp:compositor_test_support', 225 '../compositor/compositor.gyp:compositor_test_support',
231 '../ui.gyp:ui', 226 '../ui.gyp:ui',
232 '../ui.gyp:ui_resources', 227 '../ui.gyp:ui_resources',
233 'aura', 228 'aura',
229 'test_support_aura',
234 ], 230 ],
235 'include_dirs': [ 231 'include_dirs': [
236 '..', 232 '..',
237 ], 233 ],
238 'sources': [ 234 'sources': [
239 'bench/bench_main.cc', 235 'bench/bench_main.cc',
240 ], 236 ],
241 }, 237 },
242 { 238 {
243 'target_name': 'aura_unittests', 239 'target_name': 'aura_unittests',
(...skipping 28 matching lines...) Expand all
272 # osmesa GL implementation is used on linux. 268 # osmesa GL implementation is used on linux.
273 ['OS=="linux"', { 269 ['OS=="linux"', {
274 'dependencies': [ 270 'dependencies': [
275 '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa', 271 '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa',
276 ], 272 ],
277 }], 273 }],
278 ], 274 ],
279 }, 275 },
280 ], 276 ],
281 } 277 }
OLDNEW
« no previous file with comments | « content/shell/shell_aura.cc ('k') | ui/aura/bench/bench_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698