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

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

Issue 336863002: Moving input device hotplug event processing outside of ui/display (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove TouchscreenDelegate references from display_unittests Created 6 years, 3 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
« no previous file with comments | « ui/display/chromeos/x11/native_display_delegate_x11.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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 29 matching lines...) Expand all
40 '../../ui/gfx/gfx.gyp:gfx_geometry', 40 '../../ui/gfx/gfx.gyp:gfx_geometry',
41 'display_util', 41 'display_util',
42 ], 42 ],
43 'defines': [ 43 'defines': [
44 'DISPLAY_IMPLEMENTATION', 44 'DISPLAY_IMPLEMENTATION',
45 ], 45 ],
46 'sources': [ 46 'sources': [
47 # Note: file list duplicated in GN build. 47 # Note: file list duplicated in GN build.
48 'chromeos/display_configurator.cc', 48 'chromeos/display_configurator.cc',
49 'chromeos/display_configurator.h', 49 'chromeos/display_configurator.h',
50 'chromeos/touchscreen_delegate_impl.cc',
51 'chromeos/touchscreen_delegate_impl.h',
52 'chromeos/ozone/display_configurator_ozone.cc', 50 'chromeos/ozone/display_configurator_ozone.cc',
53 'chromeos/x11/display_configurator_x11.cc', 51 'chromeos/x11/display_configurator_x11.cc',
54 'chromeos/x11/display_mode_x11.cc', 52 'chromeos/x11/display_mode_x11.cc',
55 'chromeos/x11/display_mode_x11.h', 53 'chromeos/x11/display_mode_x11.h',
56 'chromeos/x11/display_snapshot_x11.cc', 54 'chromeos/x11/display_snapshot_x11.cc',
57 'chromeos/x11/display_snapshot_x11.h', 55 'chromeos/x11/display_snapshot_x11.h',
58 'chromeos/x11/display_util_x11.cc', 56 'chromeos/x11/display_util_x11.cc',
59 'chromeos/x11/display_util_x11.h', 57 'chromeos/x11/display_util_x11.h',
60 'chromeos/x11/native_display_delegate_x11.cc', 58 'chromeos/x11/native_display_delegate_x11.cc',
61 'chromeos/x11/native_display_delegate_x11.h', 59 'chromeos/x11/native_display_delegate_x11.h',
62 'chromeos/x11/native_display_event_dispatcher_x11.cc', 60 'chromeos/x11/native_display_event_dispatcher_x11.cc',
63 'chromeos/x11/native_display_event_dispatcher_x11.h', 61 'chromeos/x11/native_display_event_dispatcher_x11.h',
64 'display_export.h', 62 'display_export.h',
65 'display_switches.cc', 63 'display_switches.cc',
66 'display_switches.h', 64 'display_switches.h',
67 ], 65 ],
68 'conditions': [ 66 'conditions': [
69 ['use_x11 == 1', { 67 ['use_x11 == 1', {
70 'dependencies': [ 68 'dependencies': [
71 '../../build/linux/system.gyp:x11', 69 '../../build/linux/system.gyp:x11',
72 '../../build/linux/system.gyp:xext', 70 '../../build/linux/system.gyp:xext',
73 '../../build/linux/system.gyp:xi', 71 '../../build/linux/system.gyp:xi',
74 '../../build/linux/system.gyp:xrandr', 72 '../../build/linux/system.gyp:xrandr',
75 '../../ui/events/events.gyp:events_base',
76 '../../ui/events/platform/events_platform.gyp:events_platform', 73 '../../ui/events/platform/events_platform.gyp:events_platform',
77 ], 74 ],
78 }], 75 }],
79 ['chromeos == 1', { 76 ['chromeos == 1', {
80 'dependencies': [ 77 'dependencies': [
81 'display_types', 78 'display_types',
82 ], 79 ],
83 }], 80 }],
84 ['use_ozone == 1', { 81 ['use_ozone == 1', {
85 'dependencies': [ 82 'dependencies': [
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 '../../base/base.gyp:run_all_unittests', 153 '../../base/base.gyp:run_all_unittests',
157 '../../testing/gtest.gyp:gtest', 154 '../../testing/gtest.gyp:gtest',
158 '../../ui/gfx/gfx.gyp:gfx_geometry', 155 '../../ui/gfx/gfx.gyp:gfx_geometry',
159 'display_util', 156 'display_util',
160 ], 157 ],
161 'include_dirs': [ 158 'include_dirs': [
162 '../..', 159 '../..',
163 ], 160 ],
164 'sources': [ 161 'sources': [
165 'chromeos/display_configurator_unittest.cc', 162 'chromeos/display_configurator_unittest.cc',
166 'chromeos/touchscreen_delegate_impl_unittest.cc',
167 'chromeos/x11/display_util_x11_unittest.cc', 163 'chromeos/x11/display_util_x11_unittest.cc',
168 'chromeos/x11/native_display_event_dispatcher_x11_unittest.cc', 164 'chromeos/x11/native_display_event_dispatcher_x11_unittest.cc',
169 'util/display_util_unittest.cc', 165 'util/display_util_unittest.cc',
170 'util/edid_parser_unittest.cc', 166 'util/edid_parser_unittest.cc',
171 ], 167 ],
172 'conditions': [ 168 'conditions': [
173 ['chromeos == 1', { 169 ['chromeos == 1', {
174 'dependencies': [ 170 'dependencies': [
175 'display', 171 'display',
176 'display_test_util', 172 'display_test_util',
177 'display_types', 173 'display_types',
178 '../../ui/events/events.gyp:events_base',
179 ], 174 ],
180 }], 175 }],
181 ], 176 ],
182 }, 177 },
183 ], 178 ],
184 } 179 }
OLDNEW
« no previous file with comments | « ui/display/chromeos/x11/native_display_delegate_x11.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698