6 files changed, 8 insertions, 6 deletions
diff --git a/chromium/ui/base/BUILD.gn b/chromium/ui/base/BUILD.gn
index c421711d981..e529e55d070 100644
--- a/chromium/ui/base/BUILD.gn
+++ b/chromium/ui/base/BUILD.gn
@@ -692,6 +692,8 @@ jumbo_component("base") {
         "clipboard/clipboard_util_win.h",
         "clipboard/clipboard_win.cc",
         "clipboard/clipboard_win.h",
+        "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",
diff --git a/chromium/ui/display/win/screen_win.cc b/chromium/ui/display/win/screen_win.cc
index 7f2e7947a1f..95550001549 100644
--- a/chromium/ui/display/win/screen_win.cc
+++ b/chromium/ui/display/win/screen_win.cc
@@ -63,7 +63,7 @@ int GetPerMonitorDPI(HMONITOR monitor) {
   }
 
   DCHECK_EQ(dpi_x, dpi_y);
-  return int{dpi_x};
+  return int(dpi_x);
 }
 
 // Gets the raw monitor scale factor.
diff --git a/chromium/ui/display/win/uwp_text_scale_factor.cc b/chromium/ui/display/win/uwp_text_scale_factor.cc
index 6b661bdbed8..d3acaded0a8 100644
--- a/chromium/ui/display/win/uwp_text_scale_factor.cc
+++ b/chromium/ui/display/win/uwp_text_scale_factor.cc
@@ -162,7 +162,7 @@ class UwpTextScaleFactorImpl : public UwpTextScaleFactor {
     // equal to 1. Let's make sure that's the case - if we don't, we could get
     // bizarre behavior and divide-by-zeros later on.
     DCHECK_GE(result, 1.0);
-    return float{result};
+    return float(result);
   }
 
  private:
diff --git a/chromium/ui/gfx/platform_font_win.cc b/chromium/ui/gfx/platform_font_win.cc
index 7a43e1309b2..95081345e6c 100644
--- a/chromium/ui/gfx/platform_font_win.cc
+++ b/chromium/ui/gfx/platform_font_win.cc
@@ -740,7 +740,7 @@ void PlatformFontWin::AdjustLOGFONT(
     LOGFONT* logfont) {
   DCHECK_GT(font_adjustment.font_scale, 0.0);
   LONG new_height =
-      LONG{std::round(logfont->lfHeight * font_adjustment.font_scale)};
+      LONG(std::round(logfont->lfHeight * font_adjustment.font_scale));
   if (logfont->lfHeight && !new_height)
     new_height = logfont->lfHeight > 0 ? 1 : -1;
   logfont->lfHeight = new_height;
diff --git a/chromium/ui/views/BUILD.gn b/chromium/ui/views/BUILD.gn
index 5fcdf20a9e2..d164d16e262 100644
--- a/chromium/ui/views/BUILD.gn
+++ b/chromium/ui/views/BUILD.gn
@@ -704,7 +704,7 @@ jumbo_component("views") {
           ]
           configs += [ "//build/config/linux/atk" ]
         }
-      } else if (is_win) {
+      } else if (is_win && !use_qt) {
         public += [ "widget/desktop_aura/desktop_window_tree_host_win.h" ]
         sources += [
           "widget/desktop_aura/desktop_drag_drop_client_win.cc",
diff --git a/chromium/ui/views/widget/native_widget_aura.cc b/chromium/ui/views/widget/native_widget_aura.cc
index 28c63b02b81..3ad209e46b1 100644
--- a/chromium/ui/views/widget/native_widget_aura.cc
+++ b/chromium/ui/views/widget/native_widget_aura.cc
@@ -1066,7 +1066,7 @@ void CloseWindow(aura::Window* window) {
 }
 #endif
 
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(TOOLKIT_QT)
 BOOL CALLBACK WindowCallbackProc(HWND hwnd, LPARAM lParam) {
   aura::Window* root_window =
       DesktopWindowTreeHostWin::GetContentWindowForHWND(hwnd);
@@ -1078,7 +1078,7 @@ BOOL CALLBACK WindowCallbackProc(HWND hwnd, LPARAM lParam) {
 
 // static
 void Widget::CloseAllSecondaryWidgets() {
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(TOOLKIT_QT)
   EnumThreadWindows(GetCurrentThreadId(), WindowCallbackProc, 0);
 #endif