Uplift of #27909 (squashed) to release

Author: brave-builds

browser/ui/views/tabs/dragging/tab_drag_controller.cc

@@ -262,6 +262,66 @@ void TabDragController::DetachAndAttachToNewContext(
   }
 }
 
+gfx::Rect TabDragController::CalculateNonMaximizedDraggedBrowserBounds(
+    views::Widget* widget,
+    const gfx::Point& point_in_screen) {
+  // This method is called when dragging all tabs and moving window.
+  auto bounds =
+      TabDragControllerChromium::CalculateNonMaximizedDraggedBrowserBounds(
+          widget, point_in_screen);
+#if BUILDFLAG(IS_MAC)
+  // According to what's been observed, this only needed on Mac. Per platform,
+  // window management mechanism is different so this could happen.
+  if (is_showing_vertical_tabs_) {
+    bounds.Offset(GetVerticalTabStripWidgetOffset());
+  }
+#endif
+
+  if (is_showing_vertical_tabs_) {
+    bounds.set_size(widget->GetTopLevelWidget()->GetRestoredBounds().size());
+  }
+
+  return bounds;
+}
+
+gfx::Rect TabDragController::CalculateDraggedBrowserBounds(
+    TabDragContext* source,
+    const gfx::Point& point_in_screen,
+    std::vector<gfx::Rect>* drag_bounds) {
+  // This method is called when creating new browser by detaching tabs and
+  // when dragging all tabs in maximized window.
+  auto bounds = TabDragControllerChromium::CalculateDraggedBrowserBounds(
+      source, point_in_screen, drag_bounds);
+  if (is_showing_vertical_tabs_) {
+    // Revert back coordinate adjustment done by Chromium impl.
+    bounds.set_origin(point_in_screen);
+
+    // Adjust coordinate so that dragged tabs are under cursor.
+    DCHECK(!drag_bounds->empty());
+    bounds.Offset(-(mouse_offset_.OffsetFromOrigin()));
+    bounds.Offset({-drag_bounds->front().x(), 0});
+    bounds.Offset({-GetXCoordinateAdjustmentForMultiSelectedTabs(
+                       attached_views_, source_view_index_),
+                   0});
+
+    auto* browser_view = static_cast<BraveBrowserView*>(
+        BrowserView::GetBrowserViewForNativeWindow(
+            GetAttachedBrowserWidget()->GetNativeWindow()));
+    DCHECK(browser_view);
+
+    auto* widget_delegate_view =
+        browser_view->vertical_tab_strip_widget_delegate_view();
+    DCHECK(widget_delegate_view);
+
+    bounds.Offset(GetVerticalTabStripWidgetOffset());
+    bounds.Offset(-widget_delegate_view->vertical_tab_strip_region_view()
+                       ->GetOffsetForDraggedTab());
+    bounds.set_size(browser_view->GetRestoredBounds().size());
+  }
+
+  return bounds;
+}
+
 [[nodiscard]] TabDragController::Liveness TabDragController::ContinueDragging(
     const gfx::Point& point_in_screen) {
   auto* browser_widget = GetAttachedBrowserWidget();

browser/ui/views/tabs/dragging/tab_drag_controller.h

@@ -42,6 +42,13 @@ class TabDragController : public TabDragControllerChromium {
   void DetachAndAttachToNewContext(ReleaseCapture release_capture,
                                    TabDragContext* target_context) override;
 
+  gfx::Rect CalculateNonMaximizedDraggedBrowserBounds(
+      views::Widget* widget,
+      const gfx::Point& point_in_screen) override;
+  gfx::Rect CalculateDraggedBrowserBounds(
+      TabDragContext* source,
+      const gfx::Point& point_in_screen,
+      std::vector<gfx::Rect>* drag_bounds) override;
   [[nodiscard]] Liveness ContinueDragging(
       const gfx::Point& point_in_screen) override;
 

chromium_src/chrome/browser/ui/views/tabs/dragging/tab_drag_controller.cc

@@ -15,6 +15,12 @@
 
 #define TabDragController TabDragControllerChromium
 
+// Wraps function calls so that they can work with a child NativeWindow as well.
+#define non_client_view()                                    \
+  non_client_view()                                          \
+      ? source->GetWidget()->non_client_view()->frame_view() \
+      : source->GetWidget()->GetTopLevelWidget()->non_client_view()
+
 // Remove drag threshold when it's vertical tab strip
 #define GetHorizontalDragThreshold()                          \
   GetHorizontalDragThreshold() -                              \
@@ -27,6 +33,7 @@
 
 #include "src/chrome/browser/ui/views/tabs/dragging/tab_drag_controller.cc"
 
+#undef non_client_view
 #undef GetHorizontalDragThreshold
 #undef GetBrowserViewForNativeWindow
 #undef TabDragController

chromium_src/chrome/browser/ui/views/tabs/dragging/tab_drag_controller.h

@@ -31,11 +31,16 @@ using TabDragControllerBrave = TabDragController;
   virtual views::Widget* GetAttachedBrowserWidget
 #define GetLocalProcessWindow virtual GetLocalProcessWindow
 #define DetachAndAttachToNewContext virtual DetachAndAttachToNewContext
+#define CalculateNonMaximizedDraggedBrowserBounds \
+  virtual CalculateNonMaximizedDraggedBrowserBounds
+#define CalculateDraggedBrowserBounds virtual CalculateDraggedBrowserBounds
 #define ContinueDragging virtual ContinueDragging
 
 #include "src/chrome/browser/ui/views/tabs/dragging/tab_drag_controller.h"  // IWYU pragma: export
 
 #undef ContinueDragging
+#undef CalculateDraggedBrowserBounds
+#undef CalculateNonMaximizedDraggedBrowserBounds
 #undef DetachAndAttachToNewContext
 #undef GetLocalProcessWindow
 #undef GetAttachedBrowserWidget