1 files changed, 52 insertions, 4 deletions

diff --git a/chromium/content/browser/BUILD.gn b/chromium/content/browser/BUILD.gn
index cd5fc5b4fc9..f8ca3250719 100644
--- a/chromium/content/browser/BUILD.gn
+++ b/chromium/content/browser/BUILD.gn
@@ -2594,8 +2594,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_data_source_mac.h",
       "font_access/font_enumeration_data_source_mac.mm",
       "gpu/ca_transaction_gpu_coordinator.cc",
@@ -3108,7 +3106,7 @@ source_set("browser") {
     ]
   }
 
-  if (is_mac && !use_qt) {
+  if (is_mac && !is_qtwebengine) {
     deps += [
       "//media",
       "//third_party/mozilla",
@@ -3131,6 +3129,8 @@ source_set("browser") {
       "../app_shim_remote_cocoa/render_widget_host_view_cocoa.mm",
       "../app_shim_remote_cocoa/sharing_service_picker.h",
       "../app_shim_remote_cocoa/sharing_service_picker.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_occlusion_checker_mac.h",
       "../app_shim_remote_cocoa/web_contents_occlusion_checker_mac.mm",
       "../app_shim_remote_cocoa/web_contents_view_cocoa.h",
@@ -3155,7 +3155,7 @@ source_set("browser") {
     ]
   }
 
-  if (use_aura) {
+  if (use_aura && !is_qtwebengine) {
     deps += [
       "//ui/aura",
       "//ui/aura_extra",
@@ -3288,6 +3288,54 @@ source_set("browser") {
       "screenlock_monitor/screenlock_monitor_device_source_lacros.cc",
     ]
   }
+
+  if (is_qtwebengine) {
+    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) {