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

Unified 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 side-by-side diff with in-line comments
Download patch
Index: ui/display/BUILD.gn
diff --git a/ui/display/BUILD.gn b/ui/display/BUILD.gn
index 226485b3c11d1ba960029def94876b2933d1583a..1cda6272b36add01ef26f535bd23907bbfab6a4d 100644
--- a/ui/display/BUILD.gn
+++ b/ui/display/BUILD.gn
@@ -18,12 +18,10 @@ component("display") {
"chromeos/display_snapshot_virtual.h",
"chromeos/display_util.cc",
"chromeos/display_util.h",
- "chromeos/ozone/display_configurator_ozone.cc",
"chromeos/query_content_protection_task.cc",
"chromeos/query_content_protection_task.h",
"chromeos/update_display_configuration_task.cc",
"chromeos/update_display_configuration_task.h",
- "chromeos/x11/display_configurator_x11.cc",
"chromeos/x11/display_mode_x11.cc",
"chromeos/x11/display_mode_x11.h",
"chromeos/x11/display_snapshot_x11.cc",
@@ -60,7 +58,6 @@ component("display") {
]
if (is_chromeos && use_x11) {
- sources -= [ "chromeos/ozone/display_configurator_ozone.cc" ]
configs += [
"//build/config/linux:x11",
"//build/config/linux:xext",
@@ -76,9 +73,7 @@ component("display") {
}
if (is_chromeos && use_ozone) {
- deps += [ "//ui/ozone" ]
sources -= [
- "chromeos/x11/display_configurator_x11.cc",
"chromeos/x11/display_mode_x11.cc",
"chromeos/x11/display_mode_x11.h",
"chromeos/x11/display_snapshot_x11.cc",
« 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