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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: ui/display/BUILD.gn

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 | « extensions/shell/browser/shell_desktop_controller_aura.cc ('k') | ui/display/chromeos/display_configurator.h » ('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 import("//build/config/ui.gni") 5 import("//build/config/ui.gni")
6 import("//testing/test.gni") 6 import("//testing/test.gni")
7 7
8 component("display") { 8 component("display") {
9 sources = [ 9 sources = [
10 "chromeos/apply_content_protection_task.cc", 10 "chromeos/apply_content_protection_task.cc",
11 "chromeos/apply_content_protection_task.h", 11 "chromeos/apply_content_protection_task.h",
12 "chromeos/configure_displays_task.cc", 12 "chromeos/configure_displays_task.cc",
13 "chromeos/configure_displays_task.h", 13 "chromeos/configure_displays_task.h",
14 "chromeos/display_configurator.cc", 14 "chromeos/display_configurator.cc",
15 "chromeos/display_configurator.h", 15 "chromeos/display_configurator.h",
16 "chromeos/display_layout_manager.h", 16 "chromeos/display_layout_manager.h",
17 "chromeos/display_snapshot_virtual.cc", 17 "chromeos/display_snapshot_virtual.cc",
18 "chromeos/display_snapshot_virtual.h", 18 "chromeos/display_snapshot_virtual.h",
19 "chromeos/display_util.cc", 19 "chromeos/display_util.cc",
20 "chromeos/display_util.h", 20 "chromeos/display_util.h",
21 "chromeos/ozone/display_configurator_ozone.cc",
22 "chromeos/query_content_protection_task.cc", 21 "chromeos/query_content_protection_task.cc",
23 "chromeos/query_content_protection_task.h", 22 "chromeos/query_content_protection_task.h",
24 "chromeos/update_display_configuration_task.cc", 23 "chromeos/update_display_configuration_task.cc",
25 "chromeos/update_display_configuration_task.h", 24 "chromeos/update_display_configuration_task.h",
26 "chromeos/x11/display_configurator_x11.cc",
27 "chromeos/x11/display_mode_x11.cc", 25 "chromeos/x11/display_mode_x11.cc",
28 "chromeos/x11/display_mode_x11.h", 26 "chromeos/x11/display_mode_x11.h",
29 "chromeos/x11/display_snapshot_x11.cc", 27 "chromeos/x11/display_snapshot_x11.cc",
30 "chromeos/x11/display_snapshot_x11.h", 28 "chromeos/x11/display_snapshot_x11.h",
31 "chromeos/x11/display_util_x11.cc", 29 "chromeos/x11/display_util_x11.cc",
32 "chromeos/x11/display_util_x11.h", 30 "chromeos/x11/display_util_x11.h",
33 "chromeos/x11/native_display_delegate_x11.cc", 31 "chromeos/x11/native_display_delegate_x11.cc",
34 "chromeos/x11/native_display_delegate_x11.h", 32 "chromeos/x11/native_display_delegate_x11.h",
35 "chromeos/x11/native_display_event_dispatcher_x11.cc", 33 "chromeos/x11/native_display_event_dispatcher_x11.cc",
36 "chromeos/x11/native_display_event_dispatcher_x11.h", 34 "chromeos/x11/native_display_event_dispatcher_x11.h",
(...skipping 16 matching lines...) Expand all
53 51
54 deps = [ 52 deps = [
55 "//base", 53 "//base",
56 "//ui/display/types", 54 "//ui/display/types",
57 "//ui/display/util", 55 "//ui/display/util",
58 "//ui/gfx", 56 "//ui/gfx",
59 "//ui/gfx/geometry", 57 "//ui/gfx/geometry",
60 ] 58 ]
61 59
62 if (is_chromeos && use_x11) { 60 if (is_chromeos && use_x11) {
63 sources -= [ "chromeos/ozone/display_configurator_ozone.cc" ]
64 configs += [ 61 configs += [
65 "//build/config/linux:x11", 62 "//build/config/linux:x11",
66 "//build/config/linux:xext", 63 "//build/config/linux:xext",
67 "//build/config/linux:xi", 64 "//build/config/linux:xi",
68 "//build/config/linux:xrandr", 65 "//build/config/linux:xrandr",
69 ] 66 ]
70 deps += [ "//ui/events/platform" ] 67 deps += [ "//ui/events/platform" ]
71 } 68 }
72 69
73 deps += [] 70 deps += []
74 if (use_x11) { 71 if (use_x11) {
75 deps += [ "//ui/gfx/x" ] 72 deps += [ "//ui/gfx/x" ]
76 } 73 }
77 74
78 if (is_chromeos && use_ozone) { 75 if (is_chromeos && use_ozone) {
79 deps += [ "//ui/ozone" ]
80 sources -= [ 76 sources -= [
81 "chromeos/x11/display_configurator_x11.cc",
82 "chromeos/x11/display_mode_x11.cc", 77 "chromeos/x11/display_mode_x11.cc",
83 "chromeos/x11/display_mode_x11.h", 78 "chromeos/x11/display_mode_x11.h",
84 "chromeos/x11/display_snapshot_x11.cc", 79 "chromeos/x11/display_snapshot_x11.cc",
85 "chromeos/x11/display_snapshot_x11.h", 80 "chromeos/x11/display_snapshot_x11.h",
86 "chromeos/x11/display_util_x11.cc", 81 "chromeos/x11/display_util_x11.cc",
87 "chromeos/x11/display_util_x11.h", 82 "chromeos/x11/display_util_x11.h",
88 "chromeos/x11/native_display_delegate_x11.cc", 83 "chromeos/x11/native_display_delegate_x11.cc",
89 "chromeos/x11/native_display_delegate_x11.h", 84 "chromeos/x11/native_display_delegate_x11.h",
90 "chromeos/x11/native_display_event_dispatcher_x11.cc", 85 "chromeos/x11/native_display_event_dispatcher_x11.cc",
91 "chromeos/x11/native_display_event_dispatcher_x11.h", 86 "chromeos/x11/native_display_event_dispatcher_x11.h",
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 ] 170 ]
176 } 171 }
177 172
178 if (is_chromeos && use_ozone) { 173 if (is_chromeos && use_ozone) {
179 sources -= [ 174 sources -= [
180 "chromeos/x11/display_util_x11_unittest.cc", 175 "chromeos/x11/display_util_x11_unittest.cc",
181 "chromeos/x11/native_display_event_dispatcher_x11_unittest.cc", 176 "chromeos/x11/native_display_event_dispatcher_x11_unittest.cc",
182 ] 177 ]
183 } 178 }
184 } 179 }
OLDNEW
« no previous file with comments | « extensions/shell/browser/shell_desktop_controller_aura.cc ('k') | ui/display/chromeos/display_configurator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698