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

Unified Diff: build/config/ui.gni

Issue 750593003: Ozone X11 platform Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: cleanup leftover stuff Created 6 years 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
« no previous file with comments | « no previous file | media/ozone/media_ozone_platform.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/ui.gni
diff --git a/build/config/ui.gni b/build/config/ui.gni
index dc7a05905d7f085e525d10754b5b4d3e804b075f..878f465b3b396b4c1f24ae82c06c0f75df974793 100644
--- a/build/config/ui.gni
+++ b/build/config/ui.gni
@@ -20,6 +20,9 @@ declare_args() {
# that does not require X11.
use_ozone = false
+ # Indicates if Ozone should use X11.
+ use_ozone_x11 = false
+
# Support ChromeOS touchpad gestures with ozone.
use_evdev_gestures = false
@@ -43,6 +46,10 @@ if (is_linux) {
use_pango = false
}
+if (use_ozone_x11) {
+ use_ozone = true
+}
+
# Use GPU accelerated cross process image transport by default on linux builds
# with the Aura window manager.
ui_compositor_image_transport = use_aura && is_linux
@@ -50,7 +57,10 @@ ui_compositor_image_transport = use_aura && is_linux
use_default_render_theme = use_aura || is_linux
# Indicates if the UI toolkit depends on X11.
+# use_x11 specifies if the entire system uses X11-specific code, use_x11_backend
+# specifies if X11 is used as a backend even if use_x11 is off.
use_x11 = is_linux && !use_ozone
+use_x11_backend = use_x11 || (is_linux && use_ozone && use_ozone_x11)
use_ozone_evdev = use_ozone
« no previous file with comments | « no previous file | media/ozone/media_ozone_platform.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698