Fix wake-lock with ozone

The "X11" implementation can use both dbus and XSS, and
detects the latter at runtime, while the ozone implementation
is just a stub doing nothing.

Change-Id: I434fab0ec19a12845781f6ccece4a21813b5bca6
Reviewed-by: Michal Klocek <michal.klocek@qt.io>

1 files changed, 8 insertions, 14 deletions

diff --git a/chromium/build/config/ui.gni b/chromium/build/config/ui.gni
index f773549690f..886cca123d6 100644
--- a/chromium/build/config/ui.gni
+++ b/chromium/build/config/ui.gni
@@ -29,38 +29,32 @@ declare_args() {
   # Indicates if Aura is enabled. Aura is a low-level windowing library, sort
   # of a replacement for GDI or GTK.
   use_aura = is_win || is_linux || is_fuchsia
+}
 
+declare_args() {
   # Whether we should use glib, a low level C utility library.
-  use_glib = is_linux
+  use_glib = is_linux && !use_ozone
+
+  # Indicates if the UI toolkit depends on X11.
+  use_x11 = is_linux && !use_ozone
 }
 
 declare_args() {
+
   # True means the UI is built using the "views" framework.
   toolkit_views = (is_mac || is_win || is_chromeos || use_aura) &&
                   !is_chromecast && !is_fuchsia
 
-  use_xscrnsaver = !is_chromeos
+  use_xscrnsaver = !is_chromeos && use_x11
 }
 
 # Additional dependent variables -----------------------------------------------
 #
 # These variables depend on other variables and can't be set externally.
 
-# Indicates if the UI toolkit depends on X11.
-use_x11 = is_linux && !use_ozone
-
 # Indicates if the UI toolkit depends on GTK.
 use_gtk = use_x11 && !use_qt
 
-# Turn off glib if Ozone is enabled.
-if (use_ozone) {
-  use_glib = false
-}
-
-if (!use_x11) {
-  use_xscrnsaver = false
-}
-
 # Whether to use atk, the Accessibility ToolKit library
 use_atk = is_desktop_linux && use_gtk