refactor: remove x11 logic from filenames.gni (electron#26146)

tosmolka · Oct 26, 2020 · 2d1bbd2 · 2d1bbd2
1 parent 93e786d
commit 2d1bbd2
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 20 deletions.
diff --git a/BUILD.gn b/BUILD.gn
@@ -507,15 +507,13 @@ source_set("electron_lib") {
       "//ui/wm",
     ]
     if (use_x11) {
+      sources += filenames.lib_sources_linux_x11
       deps += [
         "//ui/gfx/x",
         "//ui/gtk/x",
       ]
     }
     configs += [ ":gio_unix" ]
-    if (use_x11) {
-      deps += [ "//ui/gfx/x" ]
-    }
     defines += [
       # Disable warnings for g_settings_list_schemas.
       "GLIB_DISABLE_DEPRECATION_WARNINGS",

diff --git a/filenames.gni b/filenames.gni
@@ -1,5 +1,3 @@
-import("//build/config/ui.gni")
-
 filenames = {
   default_app_ts_sources = [
     "default_app/default_app.ts",
@@ -45,6 +43,19 @@ filenames = {
     "shell/common/platform_util_linux.cc",
   ]
 
+  lib_sources_linux_x11 = [
+    "chromium_src/chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.cc",
+    "chromium_src/chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.h",
+    "shell/browser/ui/views/global_menu_bar_x11.cc",
+    "shell/browser/ui/views/global_menu_bar_x11.h",
+    "shell/browser/ui/x/event_disabler.cc",
+    "shell/browser/ui/x/event_disabler.h",
+    "shell/browser/ui/x/window_state_watcher.cc",
+    "shell/browser/ui/x/window_state_watcher.h",
+    "shell/browser/ui/x/x_window_utils.cc",
+    "shell/browser/ui/x/x_window_utils.h",
+  ]
+
   lib_sources_posix = [
     "chromium_src/chrome/browser/process_singleton_posix.cc",
     "shell/browser/electron_browser_main_parts_posix.cc",
@@ -634,21 +645,6 @@ filenames = {
     "shell/utility/electron_content_utility_client.h",
   ]
 
-  if (use_x11) {
-    lib_sources_linux += [
-      "chromium_src/chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.cc",
-      "chromium_src/chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.h",
-      "shell/browser/ui/views/global_menu_bar_x11.cc",
-      "shell/browser/ui/views/global_menu_bar_x11.h",
-      "shell/browser/ui/x/event_disabler.cc",
-      "shell/browser/ui/x/event_disabler.h",
-      "shell/browser/ui/x/window_state_watcher.cc",
-      "shell/browser/ui/x/window_state_watcher.h",
-      "shell/browser/ui/x/x_window_utils.cc",
-      "shell/browser/ui/x/x_window_utils.h",
-    ]
-  }
-
   lib_sources_nss = [
     "chromium_src/chrome/browser/certificate_manager_model.cc",
     "chromium_src/chrome/browser/certificate_manager_model.h",