cef/patch/patches/linux_gtk_2014.patch

diff --git build/config/linux/gtk/BUILD.gn build/config/linux/gtk/BUILD.gn
index fe2e10627f42..f984662f8318 100644
--- build/config/linux/gtk/BUILD.gn
+++ build/config/linux/gtk/BUILD.gn
@@ -4,8 +4,10 @@
 
 import("//build/config/linux/gtk/gtk.gni")
 import("//build/config/linux/pkg_config.gni")
+import("//build/config/ui.gni")
 
 assert(is_linux, "This file should only be referenced on Linux")
+assert(use_gtk, "This file should only be referenced when GTK is enabled")
 
 # GN doesn't check visibility for configs so we give this an obviously internal
 # name to discourage random targets from accidentally depending on this and
diff --git build/config/ui.gni build/config/ui.gni
index 547b42fb5c66..0eae3470e1bb 100644
--- build/config/ui.gni
+++ build/config/ui.gni
@@ -37,6 +37,9 @@ 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
+
+  # Whether we should use GTK.
+  use_gtk = use_aura && is_linux
 }
 
 # Additional dependent variables -----------------------------------------------
diff --git chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.cc chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.cc
index d44c7feaabec..5f1992335a38 100644
--- chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.cc
+++ chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h"
 
 #include "base/run_loop.h"
+#include "cef/libcef/features/features.h"
 #include "chrome/browser/chrome_browser_main.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/themes/theme_service.h"
@@ -30,6 +31,7 @@
 
 namespace {
 
+#if !BUILDFLAG(ENABLE_CEF)
 ui::NativeTheme* GetNativeThemeForWindow(aura::Window* window) {
   if (!window)
     return nullptr;
@@ -54,6 +56,7 @@ ui::NativeTheme* GetNativeThemeForWindow(aura::Window* window) {
 
   return ui::NativeTheme::GetInstanceForNativeUi();
 }
+#endif  // !BUILDFLAG(ENABLE_CEF)
 
 }  // namespace
 
@@ -67,9 +70,11 @@ ChromeBrowserMainExtraPartsViewsLinux::
 }
 
 void ChromeBrowserMainExtraPartsViewsLinux::PreEarlyInitialization() {
+#if !BUILDFLAG(ENABLE_CEF)
   views::LinuxUI* gtk_ui = BuildGtkUi();
   gtk_ui->SetNativeThemeOverride(base::Bind(&GetNativeThemeForWindow));
   views::LinuxUI::SetInstance(gtk_ui);
+#endif
 }
 
 void ChromeBrowserMainExtraPartsViewsLinux::ToolkitInitialized() {
diff --git chrome/test/BUILD.gn chrome/test/BUILD.gn
index 8654e43cf38d..4176a60bbab3 100644
--- chrome/test/BUILD.gn
+++ chrome/test/BUILD.gn
@@ -3962,7 +3962,7 @@ test("unit_tests") {
       "../browser/ui/input_method/input_method_engine_unittest.cc",
     ]
   }
-  if (!is_chromeos && !is_chromecast && is_linux) {
+  if (!is_chromeos && !is_chromecast && is_linux && use_gtk) {
     sources +=
         [ "../browser/ui/libgtkui/select_file_dialog_impl_gtk_unittest.cc" ]
     deps += [ "//build/config/linux/gtk" ]
@@ -3983,7 +3983,7 @@ test("unit_tests") {
   if (use_gio) {
     configs += [ "//build/linux:gio_config" ]
   }
-  if (!is_chromeos && !use_ozone && is_linux) {
+  if (!is_chromeos && !use_ozone && is_linux && use_gtk) {
     deps += [ "//chrome/browser/ui/libgtkui" ]
   }
 
@@ -4985,7 +4985,7 @@ if (!is_android) {
           # suites, it seems like one or another starts timing out too.
           "../browser/ui/views/keyboard_access_browsertest.cc",
         ]
-        if (!use_ozone) {
+        if (!use_ozone && use_gtk) {
           sources += [
             "../browser/ui/libgtkui/select_file_dialog_interactive_uitest.cc",
           ]
diff --git remoting/host/BUILD.gn remoting/host/BUILD.gn
index 8082ebcbeed7..b86278518197 100644
--- remoting/host/BUILD.gn
+++ remoting/host/BUILD.gn
@@ -349,7 +349,7 @@ static_library("common") {
       "//build/config/linux:xrandr",
     ]
     deps += [ "//remoting/host/linux:x11" ]
-    if (is_desktop_linux) {
+    if (is_desktop_linux && use_gtk) {
       deps += [ "//build/config/linux/gtk" ]
     }
   } else {
@@ -731,7 +731,7 @@ if (enable_me2me_host) {
       deps += [ "//components/policy:generated" ]
     }
 
-    if (is_desktop_linux) {
+    if (is_desktop_linux && use_gtk) {
       deps += [ "//build/config/linux/gtk" ]
     }
     if ((is_linux && !is_chromeos) || is_mac) {
diff --git remoting/host/it2me/BUILD.gn remoting/host/it2me/BUILD.gn
index 39dc46737578..e5cb11d5ef04 100644
--- remoting/host/it2me/BUILD.gn
+++ remoting/host/it2me/BUILD.gn
@@ -53,7 +53,7 @@ source_set("common") {
     "//remoting/resources",
     "//remoting/signaling",
   ]
-  if (is_desktop_linux) {
+  if (is_desktop_linux && use_gtk) {
     deps += [
       "//build/config/linux/gtk",
 
@@ -247,7 +247,7 @@ if (!is_chromeos && enable_remoting_host) {
         }
       }
 
-      if (is_desktop_linux) {
+      if (is_desktop_linux && use_gtk) {
         deps += [ "//build/config/linux/gtk" ]
       }
     }
diff --git remoting/host/linux/BUILD.gn remoting/host/linux/BUILD.gn
index a07f8b0254af..970c1a54b4d2 100644
--- remoting/host/linux/BUILD.gn
+++ remoting/host/linux/BUILD.gn
@@ -98,7 +98,7 @@ source_set("linux") {
   if (use_x11) {
     deps += [ ":x11" ]
   }
-  if (is_desktop_linux) {
+  if (is_desktop_linux && use_gtk) {
     deps += [ "//build/config/linux/gtk" ]
   }
 }
diff --git remoting/test/BUILD.gn remoting/test/BUILD.gn
index 0bb66b9b7e9b..bfffc92f452f 100644
--- remoting/test/BUILD.gn
+++ remoting/test/BUILD.gn
@@ -197,7 +197,7 @@ if (enable_remoting_host && !is_android && !is_chromeos) {
       ":it2me_standalone_host",
     ]
 
-    if (is_desktop_linux) {
+    if (is_desktop_linux && use_gtk) {
       deps += [ "//build/config/linux/gtk" ]
     }