Qt GN integration

- Exclude source files we override in the qt webengine sources.
- Add TOOLKIT_QT define for use_qt
- Add is_shared GN argument

Change-Id: I79925220265602bd0c39e5e03162cf1dca15befe
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

45 files changed, 262 insertions, 145 deletions

diff --git a/chromium/.gn b/chromium/.gn
index 53c3b35b02d..9f4b966edec 100644
--- a/chromium/.gn
+++ b/chromium/.gn
@@ -58,71 +58,6 @@ default_args = {
       "//third_party/vulkan-deps/vulkan-validation-layers/src"
 }
 
-# These are the targets to skip header checking by default. The files in targets
-# matching these patterns (see "gn help label_pattern" for format) will not have
-# their includes checked for proper dependencies when you run either
-# "gn check" or "gn gen --check".
-no_check_targets = [
-  # //chrome/*, https://crbug.com/949535
-  "//chrome/browser/media/router/discovery:*",  # 7 errors
-  "//chrome/browser/media/router:*",  # 225 errors
-  "//chrome/browser/safe_browsing/android:*",  # 3 errors
-  "//chrome/browser/safety_check/android:*",  # 3 errors
-  "//chrome/browser/storage_access_api:*",  # 2 errors
-  "//chrome/browser/touch_to_fill/android:*",  # 8 errors
-  "//chrome/test:*",  # 2682 errors
-  "//extensions/browser/api/declarative_net_request:*",  # 18 errors
-  "//extensions/browser/api/declarative_webrequest:*",  # 29 errors
-  "//extensions/browser/api/web_request:*",  # 37 errors
-  "//extensions/browser/api:*",  # 7 errors
-  "//extensions/browser:*",  # 20 errors
-  "//extensions:*",  # 75 errors
-  "//headless:*",  # 167 errors
-  "//jingle:*",  # 4 errors
-  "//native_client/src/trusted/service_runtime:*",  # 2 errors
-  "//ppapi/cpp/private:*",  # 1 error
-  "//ppapi/host:*",  # 1 error
-  "//ppapi/native_client/src/untrusted/pnacl_irt_shim:*",  # 197 errors
-  "//ppapi/proxy:*",  # 31 errors
-  "//ppapi/thunk:*",  # 1071 errors
-  "//ppapi:*",  # 3 errors
-  "//remoting/codec:*",  # 32 errors
-  "//remoting/host/file_transfer:*",  # 43 errors
-  "//remoting/host/installer/mac:*",  # 1 error
-  "//remoting/host/it2me:*",  # 18 errors
-  "//remoting/host/mac:*",  # 49 errors
-  "//remoting/host/security_key:*",  # 68 errors
-  "//remoting/host/setup:*",  # 9 errors
-  "//remoting/host/win:*",  # 43 errors
-  "//remoting/host:*",  # 164 errors
-  "//remoting/ios/app/settings:*",  # 6 errors
-  "//remoting/ios/app:*",  # 9 errors
-  "//remoting/ios/audio:*",  # 5 errors
-  "//remoting/ios/domain:*",  # 2 errors
-  "//remoting/ios/facade:*",  # 8 errors
-  "//remoting/ios/persistence:*",  # 10 errors
-  "//remoting/ios/session:*",  # 7 errors
-  "//remoting/ios:*",  # 2 errors
-  "//remoting/protocol:*",  # 142 errors
-  "//remoting/test:*",  # 20 errors
-  "//sandbox/win:*",  # 7 errors
-
-  "//third_party/ffmpeg:*",  # 1 error
-  "//third_party/icu/*",
-  "//third_party/libvpx:*",  # 164 errors
-  "//third_party/libwebp:*",  # 80 errors, https://crbug.com/800762
-
-  # //v8/*, https://crbug.com/v8/7330
-  "//v8/src/inspector:*",  # 20 errors
-  "//v8/test/cctest:*",  # 26 errors
-  "//v8/test/unittests:*",  # 11 errors
-  "//v8/test/wasm-api-tests:*",  # 13 errors
-  "//v8/third_party/inspector_protocol:*",  # 2 errors
-  "//v8/tools/debug_helper:*",  # 9 errors
-  "//v8/tools/v8windbg:*",  # 2 errors
-  "//v8:*",  # 1871 errors
-]
-
 # These are the list of GN files that run exec_script. This whitelist exists
 # to force additional review for new uses of exec_script, which is strongly
 # discouraged.
diff --git a/chromium/BUILD.gn b/chromium/BUILD.gn
index 6df566bd7df..fd81c247024 100644
--- a/chromium/BUILD.gn
+++ b/chromium/BUILD.gn
@@ -41,6 +41,7 @@ declare_args() {
   # checkout to add additional targets without explicitly changing any checked-
   # in files.
   root_extra_deps = []
+  qtwebengine_target = "//tools/gn"
 }
 
 if (is_official_build) {
@@ -110,7 +111,7 @@ group("gn_all") {
     deps += [ ":webui_closure_compile" ]
   }
 
-  if (!is_ios && !is_android && !is_chromecast && !is_fuchsia) {
+  if (!is_ios && !is_android && !is_chromecast && !is_fuchsia && !use_qt) {
     deps += [
       "//chrome",
       "//chrome/browser/ui/color:dump_colors",
@@ -236,7 +237,7 @@ group("gn_all") {
     deps += [ "//chrome/browser/media/router:openscreen_unittests" ]
   }
 
-  if (!is_ios && !is_fuchsia) {
+  if (!is_ios && !is_fuchsia && !use_qt) {
     deps += [
       "//chrome/test:telemetry_perf_unittests",
       "//chrome/test:unit_tests",
@@ -453,7 +454,7 @@ group("gn_all") {
     ]
   }
 
-  if (is_chromeos_ash || is_mac || is_win) {
+  if ((is_chromeos_ash || is_mac || is_win) && !use_qt) {
     deps += [
       "//rlz:rlz_id",
       "//rlz:rlz_lib",
@@ -500,7 +501,7 @@ group("gn_all") {
 
   # TODO(GYP): Figure out which of these should (and can) build
   # for chromeos/ios.
-  if (!is_chromeos_ash && !is_ios && !is_fuchsia) {
+  if (!is_chromeos_ash && !is_ios && !is_fuchsia && !use_qt) {
     deps += [
       "//base:build_utf8_validator_tables",
       "//base:check_example",
@@ -579,7 +580,7 @@ group("gn_all") {
     deps += [ "//chrome/test/chromedriver:chromedriver($host_toolchain)" ]
   }
 
-  if (is_android || (is_linux || is_chromeos_lacros)) {
+  if (is_android || ((is_linux || is_chromeos_lacros) && !use_qt)) {
     deps += [
       "//components/network_hints/browser",
       "//content/public/app",
@@ -664,7 +665,7 @@ group("gn_all") {
 
     # TODO(thakis): Enable this in cross builds, https://crbug.com/799827
     if (!(is_component_build && is_debug && target_cpu == "x86") &&
-        host_os == "win") {
+        host_os == "win" && !use_qt) {
       deps += [ "//chrome/test/mini_installer:mini_installer_tests" ]
     }
   } else if (!is_android && !is_ios && !is_fuchsia) {
@@ -870,7 +871,7 @@ if (is_fuchsia) {
 
 # TODO(GYP_GONE): Figure out if we really need this target or if there's
 # some better way to specify things.
-if (is_win) {
+if (is_win && !use_qt) {
   group("chrome_official_builder_no_unittests") {
     deps = [
       "//chrome/common/win:eventlog_provider",
@@ -1429,6 +1430,10 @@ assert(
                    ]) != [],
     "Do not use a platform name in your output directory (found \"$root_build_dir\"). http://crbug.com/548283")
 
+group("qtwebengine") {
+    deps = [ qtwebengine_target ]
+}
+
 # Write debug logs to gn_logs.txt.
 _lines = [
            "Generated during 'gn gen' by //BUILD.gn.",
diff --git a/chromium/build/config/BUILD.gn b/chromium/build/config/BUILD.gn
index c0a686022ad..47108ac47f9 100644
--- a/chromium/build/config/BUILD.gn
+++ b/chromium/build/config/BUILD.gn
@@ -108,6 +108,10 @@ config("feature_flags") {
     defines += [ "GOOGLE_CHROME_BUILD" ]
   }
 
+  if (use_qt) {
+    defines += [ "TOOLKIT_QT" ]
+  }
+
   # ==============================================
   #   PLEASE DO NOT ADD MORE THINGS TO THIS LIST
   # ==============================================
diff --git a/chromium/build/config/BUILDCONFIG.gn b/chromium/build/config/BUILDCONFIG.gn
index fa375deef6c..b1b04959598 100644
--- a/chromium/build/config/BUILDCONFIG.gn
+++ b/chromium/build/config/BUILDCONFIG.gn
@@ -162,6 +162,11 @@ declare_args() {
   is_component_build = is_debug && current_os != "ios"
 }
 
+declare_args() {
+  # Shared library build
+  is_shared = is_component_build
+}
+
 assert(!(is_debug && is_official_build), "Can't do official debug builds")
 
 # ==============================================================================
diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/compiler/BUILD.gn
index 59594aad062..7c018ffa99b 100644
--- a/chromium/build/config/compiler/BUILD.gn
+++ b/chromium/build/config/compiler/BUILD.gn
@@ -22,6 +22,9 @@ import("//build/toolchain/goma.gni")
 import("//build/toolchain/toolchain.gni")
 import("//build_overrides/build.gni")
 
+# Import features.gni for the "use_qt" argument to be available.
+import("//build/config/features.gni")
+
 if (current_cpu == "arm" || current_cpu == "arm64") {
   import("//build/config/arm.gni")
 }
@@ -335,6 +338,12 @@ config("compiler") {
     }
   }
 
+  if (use_qt && is_clang) {
+    cflags += [
+      "-Wno-unknown-warning-option"
+    ]
+  }
+
   if (is_clang && is_debug) {
     # Allow comparing the address of references and 'this' against 0
     # in debug builds. Technically, these can never be null in
diff --git a/chromium/build/config/features.gni b/chromium/build/config/features.gni
index 62bf4bcb350..f9d40a02193 100644
--- a/chromium/build/config/features.gni
+++ b/chromium/build/config/features.gni
@@ -31,6 +31,8 @@ declare_args() {
   use_dbus = (is_linux || is_chromeos) && !is_chromecast
 
   use_gio = is_linux && !is_chromecast
+
+  use_qt = false
 }
 #
 # =============================================
diff --git a/chromium/build/config/linux/gtk/gtk.gni b/chromium/build/config/linux/gtk/gtk.gni
index 6e7d7327137..0537064e918 100644
--- a/chromium/build/config/linux/gtk/gtk.gni
+++ b/chromium/build/config/linux/gtk/gtk.gni
@@ -6,7 +6,7 @@ import("//build/config/ui.gni")
 
 declare_args() {
   # Whether or not we should use libgtk.
-  use_gtk = is_linux && !is_chromecast
+  use_gtk = use_glib && !is_chromecast && !use_qt
 
   # The (major) version of GTK to build against.
   gtk_version = 3
diff --git a/chromium/build/config/linux/pangocairo/pangocairo.gni b/chromium/build/config/linux/pangocairo/pangocairo.gni
index ecfe663a4be..665b4fa2ffd 100644
--- a/chromium/build/config/linux/pangocairo/pangocairo.gni
+++ b/chromium/build/config/linux/pangocairo/pangocairo.gni
@@ -3,11 +3,11 @@
 # found in the LICENSE file.
 
 import("//build/config/chromeos/ui_mode.gni")
-import("//build/config/ui.gni")
+import("//build/config/linux/gtk/gtk.gni")
 
 declare_args() {
   use_pangocairo =
       # TODO(crbug.com/1052397): Remove !chromeos_is_browser_only once
       # lacros-chrome switches to target_os="chromeos"
-      is_linux && !is_chromecast && !chromeos_is_browser_only
+      use_gtk && !chromeos_is_browser_only
 }
diff --git a/chromium/build/config/ui.gni b/chromium/build/config/ui.gni
index 022f008ab1c..fcd86379cbd 100644
--- a/chromium/build/config/ui.gni
+++ b/chromium/build/config/ui.gni
@@ -19,6 +19,7 @@
 
 import("//build/config/chromecast_build.gni")
 import("//build/config/chromeos/ui_mode.gni")
+import("//build/config/features.gni")
 
 declare_args() {
   # Indicates if Ozone is enabled. Ozone is a low-level library layer for Linux
@@ -51,12 +52,13 @@ assert(!use_glib || ((is_linux || is_chromeos_lacros) && !is_chromecast))
 
 # TODO(crbug.com/1171629): Remove is_chromeos_lacros.
 # Whether to use atk, the Accessibility ToolKit library
-use_atk = (is_linux || is_chromeos_lacros) && !is_chromecast && use_glib
+use_atk = (is_linux || is_chromeos_lacros) && !is_chromecast && use_glib && !use_qt
 
 # Whether using Xvfb to provide a display server for a test might be
 # necessary.
 use_xvfb_in_this_config = is_linux || is_chromeos_lacros
 #
+
 # =============================================
 #   PLEASE DO NOT ADD MORE FLAGS TO THIS FILE
 # =============================================
diff --git a/chromium/build/config/win/BUILD.gn b/chromium/build/config/win/BUILD.gn
index 0adb018ff03..7ada46fbef3 100644
--- a/chromium/build/config/win/BUILD.gn
+++ b/chromium/build/config/win/BUILD.gn
@@ -472,7 +472,7 @@ config("delayloads_not_for_child_dll") {
 # See https://msdn.microsoft.com/en-us/library/2kzt1wy3.aspx for a reference of
 # what each value does.
 config("default_crt") {
-  if (is_component_build) {
+  if (is_shared) {
     # Component mode: dynamic CRT. Since the library is shared, it requires
     # exceptions or will give errors about things not matching, so keep
     # exceptions on.
diff --git a/chromium/chrome/browser/BUILD.gn b/chromium/chrome/browser/BUILD.gn
index 9d680545b28..bec1464d771 100644
--- a/chromium/chrome/browser/BUILD.gn
+++ b/chromium/chrome/browser/BUILD.gn
@@ -4741,7 +4741,6 @@ static_library("browser") {
       "install_verification/win/module_list.h",
       "install_verification/win/module_verification_common.cc",
       "install_verification/win/module_verification_common.h",
-      "media/webrtc/window_icon_util_win.cc",
       "media_galleries/win/mtp_device_delegate_impl_win.cc",
       "media_galleries/win/mtp_device_delegate_impl_win.h",
       "media_galleries/win/mtp_device_object_entry.cc",
@@ -5018,7 +5017,6 @@ static_library("browser") {
       "mac/nsprocessinfo_additions.mm",
       "mac/relauncher.h",
       "mac/relauncher.mm",
-      "media/webrtc/window_icon_util_mac.mm",
       "media_galleries/mac/mtp_device_delegate_impl_mac.h",
       "media_galleries/mac/mtp_device_delegate_impl_mac.mm",
       "memory_details_mac.cc",
diff --git a/chromium/chrome/browser/ui/BUILD.gn b/chromium/chrome/browser/ui/BUILD.gn
index 4dbdfc0c32c..834d353549f 100644
--- a/chromium/chrome/browser/ui/BUILD.gn
+++ b/chromium/chrome/browser/ui/BUILD.gn
@@ -4809,7 +4809,7 @@ static_library("test_support") {
     "//ui/shell_dialogs",
   ]
 
-  if (is_mac) {
+  if (is_mac && toolkit_views) {
     assert(toolkit_views)
     sources += [
       "cocoa/test/cocoa_test_helper.h",
diff --git a/chromium/chrome/installer/setup/BUILD.gn b/chromium/chrome/installer/setup/BUILD.gn
index d24feae2374..742aac1ea3f 100644
--- a/chromium/chrome/installer/setup/BUILD.gn
+++ b/chromium/chrome/installer/setup/BUILD.gn
@@ -45,7 +45,7 @@ if (is_win) {
       "//components/crash/core/app:crash_export_thunks",
       "//components/crash/core/app:run_as_crashpad_handler",
       "//content/public/common:static_switches",
-      "//rlz:rlz_lib_no_network",
+#      "//rlz:rlz_lib_no_network",
     ]
 
     libs = [ "netapi32.lib" ]
diff --git a/chromium/chrome/test/BUILD.gn b/chromium/chrome/test/BUILD.gn
index c56c805da69..c54cac1c6d5 100644
--- a/chromium/chrome/test/BUILD.gn
+++ b/chromium/chrome/test/BUILD.gn
@@ -805,7 +805,6 @@ if (!is_android) {
       "//chrome/browser/privacy_budget:browser_tests",
       "//chrome/browser/profiling_host:profiling_browsertests",
       "//chrome/browser/web_applications:browser_tests",
-      "//chrome/browser/webaudio:browser_tests",
       "//chrome/renderer",
       "//chrome/services/machine_learning/public/cpp",
       "//chrome/services/machine_learning/public/cpp:test_support",
@@ -2210,10 +2209,10 @@ if (!is_android) {
       } else {
         sources += [ "../browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_browsertest.cc" ]
       }
-
       deps += [
         "//build:chromeos_buildflags",
         "//chrome/browser/devtools:test_support",
+        "//chrome/browser/web_applications:browser_tests",
         "//chrome/common/extensions/api",
         "//chrome/services/media_gallery_util/public/cpp:browser_tests",
         "//chrome/test/media_router:browser_tests",
@@ -5942,14 +5941,16 @@ test("unit_tests") {
     ldflags = [ "-Wl,--strip-debug" ]
   }
   if (is_mac) {
-    sources -= [
-      # This tests the function GetSpellCheckLanguages which is not used on
-      # Mac.
-      "../browser/spellchecker/spellcheck_service_unittest.cc",
+    if (enable_spellcheck) {
+      sources -= [
+        # This tests the function GetSpellCheckLanguages which is not used on
+        # Mac.
+        "../browser/spellchecker/spellcheck_service_unittest.cc",
 
-      # This tests Chrome's spellchecker which Mac doesn't use.
-      "../tools/convert_dict/convert_dict_unittest.cc",
-    ]
+        # This tests Chrome's spellchecker which Mac doesn't use.
+        "../tools/convert_dict/convert_dict_unittest.cc",
+      ]
+    }
 
     # The test fetches resources which means Mac need the app bundle to exist
     # on disk so it can pull from it.
diff --git a/chromium/components/viz/service/gl/gpu_service_impl.cc b/chromium/components/viz/service/gl/gpu_service_impl.cc
index cce84960d35..68e19b001de 100644
--- a/chromium/components/viz/service/gl/gpu_service_impl.cc
+++ b/chromium/components/viz/service/gl/gpu_service_impl.cc
@@ -408,7 +408,7 @@ GpuServiceImpl::GpuServiceImpl(
   }
 #endif
 
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(TOOLKIT_QT)
   auto info_callback = base::BindRepeating(
       &GpuServiceImpl::UpdateOverlayAndHDRInfo, weak_ptr_factory_.GetWeakPtr());
   gl::DirectCompositionSurfaceWin::SetOverlayHDRGpuInfoUpdateCallback(
diff --git a/chromium/content/browser/BUILD.gn b/chromium/content/browser/BUILD.gn
index c278f25cd49..aeb9015b795 100644
--- a/chromium/content/browser/BUILD.gn
+++ b/chromium/content/browser/BUILD.gn
@@ -2236,8 +2236,6 @@ source_set("browser") {
   if (is_mac) {
     frameworks += [ "AppKit.framework" ]
     sources += [
-      "../app_shim_remote_cocoa/web_contents_ns_view_bridge.h",
-      "../app_shim_remote_cocoa/web_contents_ns_view_bridge.mm",
       "font_access/font_enumeration_cache_mac.h",
       "font_access/font_enumeration_cache_mac.mm",
       "gpu/ca_transaction_gpu_coordinator.cc",
@@ -2721,6 +2719,8 @@ source_set("browser") {
       "../app_shim_remote_cocoa/render_widget_host_ns_view_host_helper.h",
       "../app_shim_remote_cocoa/render_widget_host_view_cocoa.h",
       "../app_shim_remote_cocoa/render_widget_host_view_cocoa.mm",
+      "../app_shim_remote_cocoa/web_contents_ns_view_bridge.h",
+      "../app_shim_remote_cocoa/web_contents_ns_view_bridge.mm",
       "../app_shim_remote_cocoa/web_contents_view_cocoa.h",
       "../app_shim_remote_cocoa/web_contents_view_cocoa.mm",
     ]
@@ -2747,7 +2747,7 @@ source_set("browser") {
     ]
   }
 
-  if (use_aura) {
+  if (use_aura && !use_qt) {
     deps += [
       "//ui/aura",
       "//ui/aura_extra",
@@ -2879,6 +2879,54 @@ source_set("browser") {
       "//services/metrics/public/cpp:ukm_builders",
     ]
   }
+
+  if (use_qt) {
+    if (is_win) {
+      sources -= [
+        "accessibility/browser_accessibility_com_win.cc",
+        "accessibility/browser_accessibility_com_win.h",
+        "accessibility/browser_accessibility_manager_win.cc",
+        "accessibility/browser_accessibility_manager_win.h",
+        "accessibility/browser_accessibility_win.cc",
+        "accessibility/browser_accessibility_win.h",
+        "accessibility/accessibility_tree_formatter_win.cc",
+        "renderer_host/legacy_render_widget_host_win.cc",
+        "renderer_host/legacy_render_widget_host_win.h"
+      ]
+    }
+    if (is_mac) {
+      sources -= [
+        "accessibility/accessibility_tree_formatter_mac.mm",
+        "accessibility/browser_accessibility_cocoa.mm",
+        "accessibility/browser_accessibility_cocoa.h",
+        "accessibility/browser_accessibility_mac.mm",
+        "accessibility/browser_accessibility_mac.h",
+        "accessibility/browser_accessibility_manager_mac.mm",
+        "accessibility/browser_accessibility_manager_mac.h",
+        "renderer_host/input/synthetic_gesture_target_mac.h",
+        "renderer_host/input/synthetic_gesture_target_mac.mm",
+        "renderer_host/native_web_keyboard_event_mac.mm",
+        "renderer_host/render_widget_host_view_mac.mm",
+        "renderer_host/render_widget_host_view_mac.h",
+        "web_contents/web_contents_view_mac.mm",
+        "web_contents/web_contents_view_mac.h",
+        "web_contents/web_drag_dest_mac.h",
+        "web_contents/web_drag_dest_mac.mm",
+        "../app_shim_remote_cocoa/web_drag_source_mac.h",
+        "../app_shim_remote_cocoa/web_drag_source_mac.mm",
+      ]
+      deps -= [
+        "//components/remote_cocoa/app_shim",
+        "//components/remote_cocoa/browser",
+        "//components/remote_cocoa/common:mojo",
+       ]
+    }
+    if (use_aura) {
+      sources += [
+        "media/desktop_media_window_registry_aura.cc",
+      ]
+    }
+  }
 }
 
 if (is_android) {
diff --git a/chromium/content/browser/accessibility/accessibility_event_recorder_win.cc b/chromium/content/browser/accessibility/accessibility_event_recorder_win.cc
index 522139e3735..f534608ae5d 100644
--- a/chromium/content/browser/accessibility/accessibility_event_recorder_win.cc
+++ b/chromium/content/browser/accessibility/accessibility_event_recorder_win.cc
@@ -67,9 +67,11 @@ std::string BstrToPrettyUTF8(BSTR bstr) {
   // children, with an "embedded object character" for each non-text child.
   // Pretty-print the embedded object character as <obj> so that test output
   // is human-readable.
+#ifndef TOOLKIT_QT
   std::wstring embedded_character = base::UTF16ToWide(
       base::string16(1, BrowserAccessibilityComWin::kEmbeddedCharacter));
   base::ReplaceChars(wstr, embedded_character, L"<obj>", &wstr);
+#endif
 
   return base::WideToUTF8(wstr);
 }
diff --git a/chromium/content/browser/accessibility/accessibility_tools_utils_mac.mm b/chromium/content/browser/accessibility/accessibility_tools_utils_mac.mm
index b44350ad360..d764aa65ba8 100644
--- a/chromium/content/browser/accessibility/accessibility_tools_utils_mac.mm
+++ b/chromium/content/browser/accessibility/accessibility_tools_utils_mac.mm
@@ -25,7 +25,11 @@ const char kFirefoxTitle[] = "Firefox";
 const char kSafariTitle[] = "Safari";
 
 bool IsBrowserAccessibilityCocoa(const id node) {
+#if !defined(TOOLKIT_QT)
   return [node isKindOfClass:[BrowserAccessibilityCocoa class]];
+#else
+  return false;
+#endif
 }
 
 bool IsAXUIElement(const id node) {
diff --git a/chromium/content/common/BUILD.gn b/chromium/content/common/BUILD.gn
index 2ebbb4249c6..ecd3901943a 100644
--- a/chromium/content/common/BUILD.gn
+++ b/chromium/content/common/BUILD.gn
@@ -348,7 +348,6 @@ source_set("common") {
     ]
     deps += [
       ":set_process_title_linux",
-      "//third_party/fontconfig",
     ]
   }
 
@@ -359,8 +358,10 @@ source_set("common") {
     ]
   }
 
-  if (is_mac || is_win || is_android || is_fuchsia) {
+  if (is_mac || is_win || is_android || is_fuchsia || use_qt) {
     sources -= [ "font_list_fontconfig.cc" ]
+  } else {
+    deps += [ "//third_party/fontconfig" ]
   }
 
   if (enable_plugins) {
diff --git a/chromium/content/common/font_list_win.cc b/chromium/content/common/font_list_win.cc
index 7b00be911f1..72452016b6a 100644
--- a/chromium/content/common/font_list_win.cc
+++ b/chromium/content/common/font_list_win.cc
@@ -17,6 +17,7 @@
 
 namespace content {
 
+#if !defined(TOOLKIT_QT)
 std::unique_ptr<base::ListValue> GetFontList_SlowBlocking() {
   TRACE_EVENT0("fonts", "GetFontList_SlowBlocking");
 
@@ -67,5 +68,6 @@ std::unique_ptr<base::ListValue> GetFontList_SlowBlocking() {
 
   return font_list;
 }
+#endif
 
 }  // namespace content
diff --git a/chromium/device/bluetooth/BUILD.gn b/chromium/device/bluetooth/BUILD.gn
index 92fe7c3ed18..fe0b1b4b8e9 100644
--- a/chromium/device/bluetooth/BUILD.gn
+++ b/chromium/device/bluetooth/BUILD.gn
@@ -9,7 +9,7 @@ if (is_android) {
 }
 if (is_chromeos_ash) {
   import("//chromeos/dbus/use_real_dbus_clients.gni")
-} else if (use_dbus) {
+} else if (use_dbus && !use_qt) {
   use_real_dbus_clients = false
 }
 
@@ -304,7 +304,8 @@ component("bluetooth") {
   }
 
   if (is_chromeos || is_linux) {
-    if (use_dbus) {
+    if (use_dbus && is_chromeos) {
+      # This crap uses ChromeOS specific system API
       sources += [
         "bluez/bluetooth_adapter_bluez.cc",
         "bluez/bluetooth_adapter_bluez.h",
diff --git a/chromium/gpu/ipc/service/gpu_init.cc b/chromium/gpu/ipc/service/gpu_init.cc
index a82fc34973b..990982a4aac 100644
--- a/chromium/gpu/ipc/service/gpu_init.cc
+++ b/chromium/gpu/ipc/service/gpu_init.cc
@@ -47,7 +47,7 @@
 #include "ui/ozone/public/surface_factory_ozone.h"
 #endif
 
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(TOOLKIT_QT)
 #include "gpu/config/gpu_driver_bug_workarounds.h"
 #include "ui/gl/direct_composition_surface_win.h"
 #include "ui/gl/gl_surface_egl.h"
diff --git a/chromium/remoting/host/BUILD.gn b/chromium/remoting/host/BUILD.gn
index ef3c4674848..e06db3775b2 100644
--- a/chromium/remoting/host/BUILD.gn
+++ b/chromium/remoting/host/BUILD.gn
@@ -378,7 +378,7 @@ static_library("common") {
       "//ui/events/platform/x11",
       "//ui/gfx/x",
     ]
-    if (is_linux && !is_chromeos_lacros) {
+    if (use_gtk) {
       deps += [ "//build/config/linux/gtk" ]
     }
   }
@@ -822,7 +822,7 @@ if (enable_me2me_host) {
       deps += [ "//components/policy:generated" ]
     }
 
-    if (is_linux || is_chromeos_lacros) {
+    if (use_gtk) {
       deps += [ "//build/config/linux/gtk" ]
     }
     if (is_linux || is_chromeos_lacros || is_mac) {
diff --git a/chromium/remoting/host/it2me/BUILD.gn b/chromium/remoting/host/it2me/BUILD.gn
index f252c618306..4484b7e97a8 100644
--- a/chromium/remoting/host/it2me/BUILD.gn
+++ b/chromium/remoting/host/it2me/BUILD.gn
@@ -60,7 +60,7 @@ source_set("common") {
     "//remoting/resources",
     "//remoting/signaling",
   ]
-  if (is_linux && !is_chromeos_lacros) {
+  if (use_gtk) {
     deps += [
       "//build/config/linux/gtk",
 
@@ -236,7 +236,7 @@ if (!is_chromeos_ash && enable_remoting_host) {
         }
       }
 
-      if (is_linux && !is_chromeos_lacros) {
+      if (use_gtk) {
         deps += [ "//build/config/linux/gtk" ]
       }
     }
diff --git a/chromium/remoting/test/BUILD.gn b/chromium/remoting/test/BUILD.gn
index 3145636f7cd..6c491dac383 100644
--- a/chromium/remoting/test/BUILD.gn
+++ b/chromium/remoting/test/BUILD.gn
@@ -138,7 +138,7 @@ if (enable_remoting_host && !is_android && !is_chromeos_ash &&
 
     deps = [ ":it2me_standalone_host" ]
 
-    if (is_linux || is_chromeos_lacros) {
+    if (use_gtk) {
       deps += [ "//build/config/linux/gtk" ]
     }
 
diff --git a/chromium/third_party/blink/renderer/build/scripts/scripts.gni b/chromium/third_party/blink/renderer/build/scripts/scripts.gni
index be6bab77d40..33e1a430ae7 100644
--- a/chromium/third_party/blink/renderer/build/scripts/scripts.gni
+++ b/chromium/third_party/blink/renderer/build/scripts/scripts.gni
@@ -71,8 +71,12 @@ make_trie_helpers_files =
 # The executables are relative to the build directory. Don't rebase it because
 # on Posix we want to run the system one on the path.
 if (host_os == "win") {
-  gperf_exe = rebase_path("//third_party/gperf/bin/gperf.exe", root_build_dir)
-} else if (host_os == "mac") {
+  if (use_qt) {
+    gperf_exe = "gperf.exe"
+  } else {
+    gperf_exe = rebase_path("//third_party/gperf/bin/gperf.exe", root_build_dir)
+  }
+} else if (host_os == "mac" && !use_qt) {
   gperf_exe = mac_bin_path + "gperf"
 } else {
   gperf_exe = "gperf"
diff --git a/chromium/third_party/devtools-frontend/src/test/BUILD.gn b/chromium/third_party/devtools-frontend/src/test/BUILD.gn
index 05c44596973..9f58f7c5f53 100644
--- a/chromium/third_party/devtools-frontend/src/test/BUILD.gn
+++ b/chromium/third_party/devtools-frontend/src/test/BUILD.gn
@@ -4,10 +4,10 @@
 
 group("test") {
   deps = [
-    "e2e",
-    "interactions",
-    "perf",
-    "shared",
-    "unittests",
+#    "e2e",
+#    "interactions",
+#    "perf",
+#    "shared",
+#    "unittests",
   ]
 }
diff --git a/chromium/third_party/webrtc/examples/BUILD.gn b/chromium/third_party/webrtc/examples/BUILD.gn
index 704afc54673..3c3c429d55b 100644
--- a/chromium/third_party/webrtc/examples/BUILD.gn
+++ b/chromium/third_party/webrtc/examples/BUILD.gn
@@ -722,7 +722,9 @@ if (is_linux || is_chromeos || is_win) {
         "Xext",
         "Xrender",
       ]
-      deps += [ "//build/config/linux/gtk" ]
+      if (use_gtk) {
+        deps += [ "//build/config/linux/gtk" ]
+      }
     }
 
     deps += [
diff --git a/chromium/ui/accessibility/platform/BUILD.gn b/chromium/ui/accessibility/platform/BUILD.gn
index c65c091356d..563d8bebd79 100644
--- a/chromium/ui/accessibility/platform/BUILD.gn
+++ b/chromium/ui/accessibility/platform/BUILD.gn
@@ -75,6 +75,12 @@ source_set("platform") {
     "//ui/accessibility:ax_base",
     "//ui/display",
   ]
+  if (is_win) {
+    public_deps += [
+      "//third_party/iaccessible2",
+      "//ui/accessibility/platform:ichromeaccessible",
+    ]
+  }
 
   if (has_native_accessibility) {
     sources += [
diff --git a/chromium/ui/base/BUILD.gn b/chromium/ui/base/BUILD.gn
index b88df58d50b..6cfd9c9c326 100644
--- a/chromium/ui/base/BUILD.gn
+++ b/chromium/ui/base/BUILD.gn
@@ -539,7 +539,7 @@ component("base") {
     ]
   }
 
-  if (is_mac || is_win) {
+  if ((is_mac || is_win) && !use_qt) {
     deps += [ "//ui/base/clipboard" ]
   }
 
@@ -595,6 +595,43 @@ component("base") {
   if (is_android || is_ios) {
     sources -= [ "device_form_factor_desktop.cc" ]
   }
+
+  if (use_qt) {
+    if (toolkit_views || use_aura) {
+      sources -= [
+        "dragdrop/os_exchange_data_provider_factory.cc",
+        "dragdrop/os_exchange_data_provider_factory.h",
+      ]
+    }
+    if (is_linux) {
+      sources -= [
+        "resource/resource_bundle_auralinux.cc",
+      ]
+      if (use_x11) {
+        sources -= [
+          "dragdrop/os_exchange_data_provider_aurax11.cc",
+          "dragdrop/os_exchange_data_provider_aurax11.h",
+        ]
+      }
+    } else if (is_mac) {
+      sources -= [
+        "dragdrop/os_exchange_data_provider_builder_mac.h",
+        "dragdrop/os_exchange_data_provider_builder_mac.mm",
+        "dragdrop/os_exchange_data_provider_mac.mm",
+        "dragdrop/os_exchange_data_provider_mac.h",
+        "resource/resource_bundle_mac.mm",
+      ]
+    } else if (is_win) {
+      sources -= [
+        "dragdrop/drag_source_win.cc",
+        "dragdrop/drag_source_win.h",
+        "dragdrop/os_exchange_data_provider_win.cc",
+        "dragdrop/os_exchange_data_provider_win.h",
+        "resource/resource_bundle_win.cc",
+        "resource/resource_bundle_win.h",
+      ]
+    }
+  }
 }
 
 component("data_exchange") {
diff --git a/chromium/ui/base/clipboard/BUILD.gn b/chromium/ui/base/clipboard/BUILD.gn
index 6e806368add..76c23fcf423 100644
--- a/chromium/ui/base/clipboard/BUILD.gn
+++ b/chromium/ui/base/clipboard/BUILD.gn
@@ -19,11 +19,11 @@ component("clipboard_types") {
     sources += [ "clipboard_format_type.h" ]
   }
 
-  if (is_android) {
+  if (is_android && !use_qt) {
     sources += [ "clipboard_format_type_android.cc" ]
   }
 
-  if (is_mac) {
+  if (is_mac && !use_qt) {
     sources += [ "clipboard_format_type_mac.mm" ]
   }
 
@@ -31,12 +31,12 @@ component("clipboard_types") {
     sources += [ "clipboard_constants_mac.mm" ]
   }
 
-  if (is_win) {
+  if (is_win && !use_qt) {
     sources += [ "clipboard_format_type_win.cc" ]
   }
 
-  if (use_aura) {
-    if ((use_x11 && (is_linux || is_chromeos_lacros)) || !is_win) {
+  if (use_aura || use_qt) {
+    if ((use_x11 && (is_linux || is_chromeos_lacros)) || !is_win || use_qt) {
       sources += [ "clipboard_format_type_aura.cc" ]
     }
   }
@@ -46,10 +46,10 @@ component("clipboard_types") {
   deps = [ "//base" ]
 
   frameworks = []
-  if (is_apple) {
+  if (is_apple && !use_qt) {
     frameworks += [ "Foundation.framework" ]
   }
-  if (is_mac) {
+  if (is_mac && !use_qt) {
     frameworks += [ "AppKit.framework" ]
   }
 }
@@ -85,7 +85,7 @@ component("clipboard") {
     "scoped_clipboard_writer.h",
   ]
 
-  if (is_android) {
+  if (is_android && !use_qt) {
     sources += [
       "clipboard_android.cc",
       "clipboard_android.h",
@@ -101,7 +101,7 @@ component("clipboard") {
     ]
   }
 
-  if (is_win) {
+  if (is_win && !use_qt) {
     sources += [
       "clipboard_util_win.cc",
       "clipboard_util_win.h",
@@ -129,7 +129,7 @@ component("clipboard") {
     "//ui/base/data_transfer_policy",
   ]
 
-  if (use_aura) {
+  if (use_aura && !use_qt) {
     # Linux clipboard implementations.
     if ((is_linux || is_chromeos_lacros) && !is_chromecast) {
       sources += [ "clipboard_linux.cc" ]
@@ -181,7 +181,7 @@ component("clipboard") {
     deps += [ "//ui/base:ui_base_jni_headers" ]
   }
 
-  if (is_mac) {
+  if (is_mac && !use_qt) {
     deps += [ "//third_party/mozilla" ]
     frameworks = [
       "AppKit.framework",
@@ -192,6 +192,10 @@ component("clipboard") {
   if (use_ozone) {
     deps += [ "//ui/ozone" ]
   }
+  if (use_qt && is_mac) {
+    sources -= [ "clipboard_mac.h", "clipboard_mac.mm" ]
+  }
+
 }
 
 source_set("clipboard_test_support") {
diff --git a/chromium/ui/base/clipboard/clipboard_format_type.h b/chromium/ui/base/clipboard/clipboard_format_type.h
index 982209eddf7..07be3b32f1e 100644
--- a/chromium/ui/base/clipboard/clipboard_format_type.h
+++ b/chromium/ui/base/clipboard/clipboard_format_type.h
@@ -91,8 +91,10 @@ class COMPONENT_EXPORT(UI_BASE_CLIPBOARD_TYPES) ClipboardFormatType {
   // Returns a human-readable format name, or an empty string as an error value
   // if the format isn't found.
   std::string GetName() const;
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(TOOLKIT_QT)
   const FORMATETC& ToFormatEtc() const { return data_; }
+#elif defined(TOOLKIT_QT)
+  const std::string& ToString() const { return data_; }
 #elif defined(OS_APPLE)
   NSString* ToNSString() const { return data_; }
   // Custom copy and assignment constructor to handle NSString.
@@ -117,7 +119,7 @@ class COMPONENT_EXPORT(UI_BASE_CLIPBOARD_TYPES) ClipboardFormatType {
   //
   // In all platforms, format names may be ASCII or UTF8/16.
   // TODO(huangdarwin): Convert interfaces to base::string16.
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(TOOLKIT_QT)
   // When there are multiple files in the data store and they are described
   // using a file group descriptor, the file contents are retrieved by
   // requesting the CFSTR_FILECONTENTS clipboard format type and also providing
@@ -129,7 +131,7 @@ class COMPONENT_EXPORT(UI_BASE_CLIPBOARD_TYPES) ClipboardFormatType {
   // FORMATETC:
   // https://docs.microsoft.com/en-us/windows/desktop/com/the-formatetc-structure
   FORMATETC data_;
-#elif defined(USE_AURA) || defined(OS_ANDROID) || defined(OS_FUCHSIA)
+#elif defined(USE_AURA) || defined(OS_ANDROID) || defined(OS_FUCHSIA) || defined(TOOLKIT_QT)
   explicit ClipboardFormatType(const std::string& native_format);
   std::string data_;
 #elif defined(OS_APPLE)
diff --git a/chromium/ui/base/dragdrop/os_exchange_data.cc b/chromium/ui/base/dragdrop/os_exchange_data.cc
index 9d708acc056..b3f7a21e91a 100644
--- a/chromium/ui/base/dragdrop/os_exchange_data.cc
+++ b/chromium/ui/base/dragdrop/os_exchange_data.cc
@@ -102,7 +102,7 @@ bool OSExchangeData::HasAnyFormat(
     return true;
   if ((formats & URL) != 0 && HasURL(FilenameToURLPolicy::CONVERT_FILENAMES))
     return true;
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(TOOLKIT_QT)
   if ((formats & FILE_CONTENTS) != 0 && provider_->HasFileContents())
     return true;
 #endif
@@ -119,7 +119,7 @@ bool OSExchangeData::HasAnyFormat(
   return false;
 }
 
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(TOOLKIT_QT)
 void OSExchangeData::SetFileContents(const base::FilePath& filename,
                                      const std::string& file_contents) {
   provider_->SetFileContents(filename, file_contents);
diff --git a/chromium/ui/base/dragdrop/os_exchange_data.h b/chromium/ui/base/dragdrop/os_exchange_data.h
index 067e2108655..cac9b26cff0 100644
--- a/chromium/ui/base/dragdrop/os_exchange_data.h
+++ b/chromium/ui/base/dragdrop/os_exchange_data.h
@@ -13,7 +13,7 @@
 
 #include "build/build_config.h"
 
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(TOOLKIT_QT)
 #include <objidl.h>
 #endif
 
@@ -57,7 +57,7 @@ class COMPONENT_EXPORT(UI_BASE) OSExchangeData {
     URL            = 1 << 1,
     FILE_NAME      = 1 << 2,
     PICKLED_DATA   = 1 << 3,
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(TOOLKIT_QT)
     FILE_CONTENTS  = 1 << 4,
 #endif
 #if defined(USE_AURA)
@@ -132,7 +132,7 @@ class COMPONENT_EXPORT(UI_BASE) OSExchangeData {
   bool HasAnyFormat(int formats,
                     const std::set<ClipboardFormatType>& types) const;
 
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(TOOLKIT_QT)
   // Adds the bytes of a file (CFSTR_FILECONTENTS and CFSTR_FILEDESCRIPTOR on
   // Windows).
   void SetFileContents(const base::FilePath& filename,
diff --git a/chromium/ui/base/dragdrop/os_exchange_data_provider.h b/chromium/ui/base/dragdrop/os_exchange_data_provider.h
index 32c95b457dd..9749a495677 100644
--- a/chromium/ui/base/dragdrop/os_exchange_data_provider.h
+++ b/chromium/ui/base/dragdrop/os_exchange_data_provider.h
@@ -73,11 +73,11 @@ class COMPONENT_EXPORT(UI_BASE_DATA_EXCHANGE) OSExchangeDataProvider {
   virtual bool HasFile() const = 0;
   virtual bool HasCustomFormat(const ClipboardFormatType& format) const = 0;
 
-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN)
+#if (defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN)) && !defined(TOOLKIT_QT)
   virtual void SetFileContents(const base::FilePath& filename,
                                const std::string& file_contents) = 0;
 #endif
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(TOOLKIT_QT)
   virtual bool GetFileContents(base::FilePath* filename,
                                std::string* file_contents) const = 0;
   virtual bool HasFileContents() const = 0;
diff --git a/chromium/ui/gfx/BUILD.gn b/chromium/ui/gfx/BUILD.gn
index 76622085d42..78b0a0e61c4 100644
--- a/chromium/ui/gfx/BUILD.gn
+++ b/chromium/ui/gfx/BUILD.gn
@@ -585,7 +585,7 @@ source_set("memory_buffer_sources") {
     "//ui/gfx/geometry",
   ]
 
-  if (is_linux || is_chromeos) {
+  if ((is_linux || is_chromeos) && !use_qt) {
     sources += [
       "linux/client_native_pixmap_dmabuf.cc",
       "linux/client_native_pixmap_dmabuf.h",
diff --git a/chromium/ui/gl/BUILD.gn b/chromium/ui/gl/BUILD.gn
index 4990f50a7e7..4d07b7e77db 100644
--- a/chromium/ui/gl/BUILD.gn
+++ b/chromium/ui/gl/BUILD.gn
@@ -249,7 +249,7 @@ component("gl") {
     deps += [ "//ui/ozone:buildflags" ]
   }
 
-  if (use_x11 || ozone_platform_x11) {
+  if ((use_x11 || ozone_platform_x11) && !use_qt) {
     sources += [
       "gl_image_egl_pixmap.cc",
       "gl_image_egl_pixmap.h",
@@ -286,14 +286,19 @@ component("gl") {
       "gl_image_glx.h",
       "gl_image_glx_native_pixmap.cc",
       "gl_image_glx_native_pixmap.h",
-      "gl_surface_glx.cc",
-      "gl_surface_glx.h",
       "gl_visual_picker_glx.cc",
       "gl_visual_picker_glx.h",
       "glx_util.cc",
       "glx_util.h",
     ]
 
+    if (!use_qt) {
+      sources += [
+        "gl_surface_glx.cc",
+        "gl_surface_glx.h",
+      ]
+    }
+
     deps += [
       "//ui/base/x",
       "//ui/gfx/x",
@@ -401,11 +406,31 @@ component("gl") {
     defines += [ "CHROMECAST_BUILD" ]
   }
 
-  if (use_qt && (is_win || use_x11 || ozone_platform_x11 || (is_mac && use_egl))) {
-    data_deps -= [
-      "//third_party/angle:libEGL",
-      "//third_party/angle:libGLESv2",
-    ]
+  if (use_qt) {
+    if (is_win || (is_mac && use_egl)) {
+      data_deps -= [
+        "//third_party/angle:libEGL",
+        "//third_party/angle:libGLESv2",
+      ]
+    }
+    if (is_win) {
+      sources -= [
+        "dc_layer_tree.cc",
+        "dc_layer_tree.h",
+        "direct_composition_child_surface_win.cc",
+        "direct_composition_child_surface_win.h",
+        "direct_composition_surface_win.cc",
+        "direct_composition_surface_win.h",
+        "swap_chain_presenter.cc",
+        "swap_chain_presenter.h",
+      ]
+    }
+    if (is_linux || is_win) {
+      sources -= [
+        "gl_surface_egl.cc",
+        "gl_surface_egl.h",
+      ]
+    }
   }
 }
 
diff --git a/chromium/ui/gl/init/gl_factory_linux_x11.cc b/chromium/ui/gl/init/gl_factory_linux_x11.cc
index 400372bc0c1..3671b3d34e5 100644
--- a/chromium/ui/gl/init/gl_factory_linux_x11.cc
+++ b/chromium/ui/gl/init/gl_factory_linux_x11.cc
@@ -72,6 +72,7 @@ scoped_refptr<GLContext> CreateGLContextX11(GLShareGroup* share_group,
   }
 }
 
+#ifndef TOOLKIT_QT
 scoped_refptr<GLSurface> CreateViewGLSurfaceX11(gfx::AcceleratedWidget window) {
   TRACE_EVENT0("gpu", "gl::init::CreateViewGLSurface");
   switch (GetGLImplementation()) {
@@ -121,6 +122,7 @@ scoped_refptr<GLSurface> CreateOffscreenGLSurfaceWithFormatX11(
       return nullptr;
   }
 }
+#endif
 
 void SetDisabledExtensionsPlatformX11(const std::string& disabled_extensions) {
   GLImplementation implementation = GetGLImplementation();
diff --git a/chromium/ui/gl/init/gl_factory_ozone.cc b/chromium/ui/gl/init/gl_factory_ozone.cc
index a53de798086..787449367bb 100644
--- a/chromium/ui/gl/init/gl_factory_ozone.cc
+++ b/chromium/ui/gl/init/gl_factory_ozone.cc
@@ -57,6 +57,7 @@ bool GetGLWindowSystemBindingInfo(const GLVersionInfo& gl_info,
   return false;
 }
 
+#if !defined(TOOLKIT_QT)
 scoped_refptr<GLContext> CreateGLContext(GLShareGroup* share_group,
                                          GLSurface* compatible_surface,
                                          const GLContextAttribs& attribs) {
@@ -164,6 +165,7 @@ scoped_refptr<GLSurface> CreateOffscreenGLSurfaceWithFormat(
 
   return nullptr;
 }
+#endif
 
 void SetDisabledExtensionsPlatform(const std::string& disabled_extensions) {
 #if defined(USE_X11)
diff --git a/chromium/ui/gl/init/gl_factory_win.cc b/chromium/ui/gl/init/gl_factory_win.cc
index 6e58b3e5621..109d564d22d 100644
--- a/chromium/ui/gl/init/gl_factory_win.cc
+++ b/chromium/ui/gl/init/gl_factory_win.cc
@@ -37,7 +37,7 @@ bool GetGLWindowSystemBindingInfo(const GLVersionInfo& gl_info,
       return false;
   }
 }
-
+#if !defined(TOOLKIT_QT)
 scoped_refptr<GLContext> CreateGLContext(GLShareGroup* share_group,
                                          GLSurface* compatible_surface,
                                          const GLContextAttribs& attribs) {
@@ -100,6 +100,7 @@ scoped_refptr<GLSurface> CreateOffscreenGLSurfaceWithFormat(
       return nullptr;
   }
 }
+#endif
 
 void SetDisabledExtensionsPlatform(const std::string& disabled_extensions) {
   GLImplementation implementation = GetGLImplementation();
diff --git a/chromium/ui/gl/init/gl_initializer_linux_x11.cc b/chromium/ui/gl/init/gl_initializer_linux_x11.cc
index b1f21c4bf0e..58717065c99 100644
--- a/chromium/ui/gl/init/gl_initializer_linux_x11.cc
+++ b/chromium/ui/gl/init/gl_initializer_linux_x11.cc
@@ -163,6 +163,7 @@ bool InitializeStaticEGLInternal(GLImplementation implementation) {
 
 }  // namespace
 
+#if !defined(TOOLKIT_QT)
 bool InitializeGLOneOffPlatformX11() {
   switch (GetGLImplementation()) {
     case kGLImplementationDesktopGL:
@@ -218,6 +219,7 @@ bool InitializeStaticGLBindingsX11(GLImplementation implementation) {
 
   return false;
 }
+#endif // !defined(TOOLKIT_QT)
 
 void ShutdownGLPlatformX11() {
   GLSurfaceEGL::ShutdownOneOff();
diff --git a/chromium/ui/gl/init/gl_initializer_ozone.cc b/chromium/ui/gl/init/gl_initializer_ozone.cc
index aac4833f6c9..ee4f4570c56 100644
--- a/chromium/ui/gl/init/gl_initializer_ozone.cc
+++ b/chromium/ui/gl/init/gl_initializer_ozone.cc
@@ -24,6 +24,7 @@
 namespace gl {
 namespace init {
 
+#if !defined(TOOLKIT_QT)
 bool InitializeGLOneOffPlatform() {
 #if defined(USE_X11)
   if (!features::IsUsingOzonePlatform())
@@ -46,6 +47,7 @@ bool InitializeGLOneOffPlatform() {
 #endif
   return false;
 }
+#endif
 
 bool InitializeStaticGLBindings(GLImplementation implementation) {
 #if defined(USE_X11)
diff --git a/chromium/ui/gl/init/gl_initializer_win.cc b/chromium/ui/gl/init/gl_initializer_win.cc
index 2b15b09f6c3..b6e0ce20723 100644
--- a/chromium/ui/gl/init/gl_initializer_win.cc
+++ b/chromium/ui/gl/init/gl_initializer_win.cc
@@ -141,6 +141,7 @@ bool InitializeStaticEGLInternal(GLImplementation implementation) {
 
 }  // namespace
 
+#if !defined(TOOLKIT_QT)
 bool InitializeGLOneOffPlatform() {
   VSyncProviderWin::InitializeOneOff();
 
@@ -160,6 +161,7 @@ bool InitializeGLOneOffPlatform() {
   }
   return true;
 }
+#endif
 
 bool InitializeStaticGLBindings(GLImplementation implementation) {
   // Prevent reinitialization with a different implementation. Once the gpu
diff --git a/chromium/ui/ozone/common/BUILD.gn b/chromium/ui/ozone/common/BUILD.gn
index 59c8b17465d..cd94fe8b55a 100644
--- a/chromium/ui/ozone/common/BUILD.gn
+++ b/chromium/ui/ozone/common/BUILD.gn
@@ -26,6 +26,13 @@ source_set("common") {
     "//ui/ozone:ozone_base",
   ]
 
+  if (use_qt) {
+    sources -= [
+      "gl_surface_egl_readback.cc",
+      "gl_surface_egl_readback.h",
+    ]
+  }
+
   deps = [
     "//ui/gfx/ipc/color",
     "//ui/gl",
diff --git a/chromium/ui/touch_selection/BUILD.gn b/chromium/ui/touch_selection/BUILD.gn
index 5e7fdbaf767..952c6140775 100644
--- a/chromium/ui/touch_selection/BUILD.gn
+++ b/chromium/ui/touch_selection/BUILD.gn
@@ -36,7 +36,7 @@ component("touch_selection") {
     "//ui/gfx/geometry",
   ]
 
-  if (use_aura) {
+  if (use_aura && toolkit_views) {
     deps += [
       "//skia:skia",
       "//ui/aura",