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

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

Issue 1878903002: Use injection and remove ozone dependency from ui/display (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix unique_ptr 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/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 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 'chromeos/apply_content_protection_task.h', 50 'chromeos/apply_content_protection_task.h',
51 'chromeos/configure_displays_task.cc', 51 'chromeos/configure_displays_task.cc',
52 'chromeos/configure_displays_task.h', 52 'chromeos/configure_displays_task.h',
53 'chromeos/display_configurator.cc', 53 'chromeos/display_configurator.cc',
54 'chromeos/display_configurator.h', 54 'chromeos/display_configurator.h',
55 'chromeos/display_layout_manager.h', 55 'chromeos/display_layout_manager.h',
56 'chromeos/display_snapshot_virtual.cc', 56 'chromeos/display_snapshot_virtual.cc',
57 'chromeos/display_snapshot_virtual.h', 57 'chromeos/display_snapshot_virtual.h',
58 'chromeos/display_util.cc', 58 'chromeos/display_util.cc',
59 'chromeos/display_util.h', 59 'chromeos/display_util.h',
60 'chromeos/ozone/display_configurator_ozone.cc',
61 'chromeos/query_content_protection_task.cc', 60 'chromeos/query_content_protection_task.cc',
62 'chromeos/query_content_protection_task.h', 61 'chromeos/query_content_protection_task.h',
63 'chromeos/update_display_configuration_task.cc', 62 'chromeos/update_display_configuration_task.cc',
64 'chromeos/update_display_configuration_task.h', 63 'chromeos/update_display_configuration_task.h',
65 'chromeos/x11/display_configurator_x11.cc',
66 'chromeos/x11/display_mode_x11.cc', 64 'chromeos/x11/display_mode_x11.cc',
67 'chromeos/x11/display_mode_x11.h', 65 'chromeos/x11/display_mode_x11.h',
68 'chromeos/x11/display_snapshot_x11.cc', 66 'chromeos/x11/display_snapshot_x11.cc',
69 'chromeos/x11/display_snapshot_x11.h', 67 'chromeos/x11/display_snapshot_x11.h',
70 'chromeos/x11/display_util_x11.cc', 68 'chromeos/x11/display_util_x11.cc',
71 'chromeos/x11/display_util_x11.h', 69 'chromeos/x11/display_util_x11.h',
72 'chromeos/x11/native_display_delegate_x11.cc', 70 'chromeos/x11/native_display_delegate_x11.cc',
73 'chromeos/x11/native_display_delegate_x11.h', 71 'chromeos/x11/native_display_delegate_x11.h',
74 'chromeos/x11/native_display_event_dispatcher_x11.cc', 72 'chromeos/x11/native_display_event_dispatcher_x11.cc',
75 'chromeos/x11/native_display_event_dispatcher_x11.h', 73 'chromeos/x11/native_display_event_dispatcher_x11.h',
(...skipping 24 matching lines...) Expand all
100 ['chromeos == 1', { 98 ['chromeos == 1', {
101 'dependencies': [ 99 'dependencies': [
102 'display_types', 100 'display_types',
103 ], 101 ],
104 }], 102 }],
105 ['chromeos == 1 and use_x11 == 1', { 103 ['chromeos == 1 and use_x11 == 1', {
106 'dependencies': [ 104 'dependencies': [
107 '../gfx/x/gfx_x11.gyp:gfx_x11', 105 '../gfx/x/gfx_x11.gyp:gfx_x11',
108 ], 106 ],
109 }], 107 }],
110 ['use_ozone == 1', {
111 'dependencies': [
112 '../../ui/ozone/ozone.gyp:ozone',
113 ],
114 }],
115 ], 108 ],
116 }, 109 },
117 { 110 {
118 # GN version: //ui/display/util 111 # GN version: //ui/display/util
119 'target_name': 'display_util', 112 'target_name': 'display_util',
120 'type': '<(component)', 113 'type': '<(component)',
121 'dependencies': [ 114 'dependencies': [
122 '../../base/base.gyp:base', 115 '../../base/base.gyp:base',
123 '../../ui/gfx/gfx.gyp:gfx_geometry', 116 '../../ui/gfx/gfx.gyp:gfx_geometry',
124 ], 117 ],
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
250 '../../build/isolate.gypi', 243 '../../build/isolate.gypi',
251 ], 244 ],
252 'sources': [ 245 'sources': [
253 'display_unittests.isolate', 246 'display_unittests.isolate',
254 ], 247 ],
255 }, 248 },
256 ], 249 ],
257 }], 250 }],
258 ], 251 ],
259 } 252 }
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