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

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

Issue 1834243003: Revert of Move ScreenWin to ui/display (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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 | « ui/display/DEPS ('k') | ui/display/display_unittests.isolate » ('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 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 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 'chromeos/x11/display_snapshot_x11.h', 69 'chromeos/x11/display_snapshot_x11.h',
70 'chromeos/x11/display_util_x11.cc', 70 'chromeos/x11/display_util_x11.cc',
71 'chromeos/x11/display_util_x11.h', 71 'chromeos/x11/display_util_x11.h',
72 'chromeos/x11/native_display_delegate_x11.cc', 72 'chromeos/x11/native_display_delegate_x11.cc',
73 'chromeos/x11/native_display_delegate_x11.h', 73 'chromeos/x11/native_display_delegate_x11.h',
74 'chromeos/x11/native_display_event_dispatcher_x11.cc', 74 'chromeos/x11/native_display_event_dispatcher_x11.cc',
75 'chromeos/x11/native_display_event_dispatcher_x11.h', 75 'chromeos/x11/native_display_event_dispatcher_x11.h',
76 'display_export.h', 76 'display_export.h',
77 'display_switches.cc', 77 'display_switches.cc',
78 'display_switches.h', 78 'display_switches.h',
79 'win/display_info.cc',
80 'win/display_info.h',
81 'win/screen_win.cc',
82 'win/screen_win.h',
83 'win/screen_win_display.cc',
84 'win/screen_win_display.h',
85 ], 79 ],
86 'conditions': [ 80 'conditions': [
87 ['use_x11 == 1', { 81 ['use_x11 == 1', {
88 'dependencies': [ 82 'dependencies': [
89 '../../build/linux/system.gyp:x11', 83 '../../build/linux/system.gyp:x11',
90 '../../build/linux/system.gyp:xext', 84 '../../build/linux/system.gyp:xext',
91 '../../build/linux/system.gyp:xi', 85 '../../build/linux/system.gyp:xi',
92 '../../build/linux/system.gyp:xrandr', 86 '../../build/linux/system.gyp:xrandr',
93 '../../ui/events/platform/events_platform.gyp:events_platform', 87 '../../ui/events/platform/events_platform.gyp:events_platform',
94 ], 88 ],
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
195 }, 189 },
196 { 190 {
197 # GN version: //ui/display:display_unittests 191 # GN version: //ui/display:display_unittests
198 'target_name': 'display_unittests', 192 'target_name': 'display_unittests',
199 'type': 'executable', 193 'type': 'executable',
200 'dependencies': [ 194 'dependencies': [
201 '../../base/base.gyp:run_all_unittests', 195 '../../base/base.gyp:run_all_unittests',
202 '../../testing/gtest.gyp:gtest', 196 '../../testing/gtest.gyp:gtest',
203 '../../ui/gfx/gfx.gyp:gfx_geometry', 197 '../../ui/gfx/gfx.gyp:gfx_geometry',
204 '../../ui/gfx/gfx.gyp:gfx_test_support', 198 '../../ui/gfx/gfx.gyp:gfx_test_support',
205 'display',
206 'display_util', 199 'display_util',
207 ], 200 ],
208 'include_dirs': [ 201 'include_dirs': [
209 '../..', 202 '../..',
210 ], 203 ],
211 'sources': [ 204 'sources': [
212 'chromeos/apply_content_protection_task_unittest.cc', 205 'chromeos/apply_content_protection_task_unittest.cc',
213 'chromeos/configure_displays_task_unittest.cc', 206 'chromeos/configure_displays_task_unittest.cc',
214 'chromeos/display_configurator_unittest.cc', 207 'chromeos/display_configurator_unittest.cc',
215 'chromeos/query_content_protection_task_unittest.cc', 208 'chromeos/query_content_protection_task_unittest.cc',
216 'chromeos/update_display_configuration_task_unittest.cc', 209 'chromeos/update_display_configuration_task_unittest.cc',
217 'chromeos/x11/display_util_x11_unittest.cc', 210 'chromeos/x11/display_util_x11_unittest.cc',
218 'chromeos/x11/native_display_event_dispatcher_x11_unittest.cc', 211 'chromeos/x11/native_display_event_dispatcher_x11_unittest.cc',
219 'util/display_util_unittest.cc', 212 'util/display_util_unittest.cc',
220 'util/edid_parser_unittest.cc', 213 'util/edid_parser_unittest.cc',
221 'win/screen_win_unittest.cc',
222 ], 214 ],
223 'conditions': [ 215 'conditions': [
224 ['chromeos == 1', { 216 ['chromeos == 1', {
225 'dependencies': [ 217 'dependencies': [
226 'display', 218 'display',
227 'display_test_support', 219 'display_test_support',
228 'display_test_util', 220 'display_test_util',
229 'display_types', 221 'display_types',
230 ], 222 ],
231 }], 223 }],
(...skipping 13 matching lines...) Expand all
245 '../../build/isolate.gypi', 237 '../../build/isolate.gypi',
246 ], 238 ],
247 'sources': [ 239 'sources': [
248 'display_unittests.isolate', 240 'display_unittests.isolate',
249 ], 241 ],
250 }, 242 },
251 ], 243 ],
252 }], 244 }],
253 ], 245 ],
254 } 246 }
OLDNEW
« no previous file with comments | « ui/display/DEPS ('k') | ui/display/display_unittests.isolate » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698