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

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

Issue 1390883003: aura: Unify WindowTreeHost for some platforms (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix ash_unittests, sadrul's comments Created 5 years, 2 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
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 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 'window_observer.h', 101 'window_observer.h',
102 'window_targeter.cc', 102 'window_targeter.cc',
103 'window_targeter.h', 103 'window_targeter.h',
104 'window_tracker.cc', 104 'window_tracker.cc',
105 'window_tracker.h', 105 'window_tracker.h',
106 'window_tree_host.cc', 106 'window_tree_host.cc',
107 'window_tree_host.h', 107 'window_tree_host.h',
108 'window_tree_host_mac.h', 108 'window_tree_host_mac.h',
109 'window_tree_host_mac.mm', 109 'window_tree_host_mac.mm',
110 'window_tree_host_observer.h', 110 'window_tree_host_observer.h',
111 'window_tree_host_ozone.cc', 111 'window_tree_host_platform.cc',
112 'window_tree_host_ozone.h', 112 'window_tree_host_platform.h',
113 'window_tree_host_win.cc',
114 'window_tree_host_win.h',
115 'window_tree_host_x11.cc', 113 'window_tree_host_x11.cc',
116 'window_tree_host_x11.h', 114 'window_tree_host_x11.h',
117 ], 115 ],
118 'conditions': [ 116 'conditions': [
119 ['use_x11==1', { 117 ['use_x11==1', {
120 'dependencies': [ 118 'dependencies': [
121 '../../build/linux/system.gyp:x11', 119 '../../build/linux/system.gyp:x11',
122 '../../build/linux/system.gyp:xrandr', 120 '../../build/linux/system.gyp:xrandr',
123 '../../build/linux/system.gyp:xi', 121 '../../build/linux/system.gyp:xi',
124 '../events/devices/events_devices.gyp:events_devices', 122 '../events/devices/events_devices.gyp:events_devices',
(...skipping 10 matching lines...) Expand all
135 'sources!': [ 133 'sources!': [
136 'input_state_lookup.cc', 134 'input_state_lookup.cc',
137 ], 135 ],
138 }], 136 }],
139 ['use_ozone==1', { 137 ['use_ozone==1', {
140 'dependencies': [ 138 'dependencies': [
141 '../ozone/ozone.gyp:ozone', 139 '../ozone/ozone.gyp:ozone',
142 '../ozone/ozone.gyp:ozone_base', 140 '../ozone/ozone.gyp:ozone_base',
143 ], 141 ],
144 }], 142 }],
143 ['OS!="win" and OS!="android" and use_ozone==0', {
144 'sources!': [
145 'window_tree_host_platform.cc',
146 'window_tree_host_platform.h',
147 ],
148 }],
149 ['OS=="android"', {
150 'dependencies': [
151 '../platform_window/android/android_window.gyp:android_window',
oshima 2015/10/16 18:31:42 nit: indent
152 ],
153 }],
145 ], 154 ],
146 }, 155 },
147 { 156 {
148 # GN version: //ui/aura:test_support 157 # GN version: //ui/aura:test_support
149 'target_name': 'aura_test_support', 158 'target_name': 'aura_test_support',
150 'type': 'static_library', 159 'type': 'static_library',
151 'dependencies': [ 160 'dependencies': [
152 '../../skia/skia.gyp:skia', 161 '../../skia/skia.gyp:skia',
153 '../../testing/gtest.gyp:gtest', 162 '../../testing/gtest.gyp:gtest',
154 '../base/ime/ui_base_ime.gyp:ui_base_ime', 163 '../base/ime/ui_base_ime.gyp:ui_base_ime',
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
334 'dependencies': [ 343 'dependencies': [
335 '../../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 344 '../../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
336 ], 345 ],
337 }], 346 }],
338 ], 347 ],
339 }, 348 },
340 ], 349 ],
341 }], 350 }],
342 ], 351 ],
343 } 352 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698