Differential D23984 Diff 69308 head/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc
Changeset View
Changeset View
Standalone View
Standalone View
head/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc
--- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2019-12-16 21:51:24 UTC | --- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2020-03-03 18:53:52 UTC | ||||
+++ chrome/browser/ui/views/tabs/tab_drag_controller.cc | +++ chrome/browser/ui/views/tabs/tab_drag_controller.cc | ||||
@@ -446,7 +446,7 @@ void TabDragController::Init(TabDragContext* source_co | @@ -450,7 +450,7 @@ void TabDragController::Init(TabDragContext* source_co | ||||
// synchronous on desktop Linux, so use that. | // synchronous on desktop Linux, so use that. | ||||
// - Chrome OS | // - Chrome OS | ||||
// Releasing capture on Ash cancels gestures so avoid it. | // Releasing capture on Ash cancels gestures so avoid it. | ||||
-#if defined(OS_LINUX) | -#if defined(OS_LINUX) | ||||
+#if defined(OS_LINUX) || defined(OS_BSD) | +#if defined(OS_LINUX) || defined(OS_BSD) | ||||
can_release_capture_ = false; | can_release_capture_ = false; | ||||
#endif | #endif | ||||
start_point_in_screen_ = gfx::Point(source_tab_offset, mouse_offset.y()); | start_point_in_screen_ = gfx::Point(source_view_offset, mouse_offset.y()); | ||||
@@ -883,7 +883,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon | @@ -895,7 +895,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon | ||||
else | else | ||||
SetCapture(target_context); | SetCapture(target_context); | ||||
-#if !defined(OS_LINUX) || defined(OS_CHROMEOS) | -#if !defined(OS_LINUX) || defined(OS_CHROMEOS) | ||||
+#if (!defined(OS_LINUX) || defined(OS_CHROMEOS)) && !defined(OS_BSD) | +#if (!defined(OS_LINUX) || defined(OS_CHROMEOS)) && !defined(OS_BSD) | ||||
// EndMoveLoop is going to snap the window back to its original location. | // EndMoveLoop is going to snap the window back to its original location. | ||||
// Hide it so users don't see this. Hiding a window in Linux aura causes | // Hide it so users don't see this. Hiding a window in Linux aura causes | ||||
// it to lose capture so skip it. | // it to lose capture so skip it. | ||||
@@ -2016,7 +2016,7 @@ TabDragController::Liveness TabDragController::GetLoca | @@ -2060,7 +2060,7 @@ TabDragController::Liveness TabDragController::GetLoca | ||||
if (dragged_window) | if (dragged_window) | ||||
exclude.insert(dragged_window); | exclude.insert(dragged_window); | ||||
} | } | ||||
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) | -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) | ||||
+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) | +#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) | ||||
// Exclude windows which are pending deletion via Browser::TabStripEmpty(). | // Exclude windows which are pending deletion via Browser::TabStripEmpty(). | ||||
// These windows can be returned in the Linux Aura port because the browser | // These windows can be returned in the Linux Aura port because the browser | ||||
// window which was used for dragging is not hidden once all of its tabs are | // window which was used for dragging is not hidden once all of its tabs are |