Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3115)

Unified Diff: chrome/browser/ui/views/tabs/tab_drag_controller.cc

Issue 1907323003: Drag and drop cleans up touch sequences from the source window. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix Mac. Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/shelf/shelf_tooltip_manager_unittest.cc ('k') | ui/aura/gestures/gesture_recognizer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/tabs/tab_drag_controller.cc
diff --git a/chrome/browser/ui/views/tabs/tab_drag_controller.cc b/chrome/browser/ui/views/tabs/tab_drag_controller.cc
index 6439c44a05e4541da8051f5567d65e9cc9792cc9..3898dee1bd5329a87f545e751018e960dd64a970 100644
--- a/chrome/browser/ui/views/tabs/tab_drag_controller.cc
+++ b/chrome/browser/ui/views/tabs/tab_drag_controller.cc
@@ -580,7 +580,8 @@ TabDragController::DragBrowserToNewTabStrip(
// Only Aura windows are gesture consumers.
ui::GestureRecognizer::Get()->TransferEventsTo(
GetAttachedBrowserWidget()->GetNativeView(),
- target_tabstrip->GetWidget()->GetNativeView());
+ target_tabstrip->GetWidget()->GetNativeView(),
+ ui::GestureRecognizer::ShouldCancelTouches::DontCancel);
#endif
if (is_dragging_window_) {
@@ -1035,7 +1036,8 @@ void TabDragController::DetachIntoNewBrowserAndRunMoveLoop(
gfx::NativeView attached_native_view =
attached_tabstrip_->GetWidget()->GetNativeView();
ui::GestureRecognizer::Get()->TransferEventsTo(
- attached_native_view, dragged_widget->GetNativeView());
+ attached_native_view, dragged_widget->GetNativeView(),
+ ui::GestureRecognizer::ShouldCancelTouches::DontCancel);
#endif
Detach(can_release_capture_ ? RELEASE_CAPTURE : DONT_RELEASE_CAPTURE);
« no previous file with comments | « ash/shelf/shelf_tooltip_manager_unittest.cc ('k') | ui/aura/gestures/gesture_recognizer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698