Chromium Code Reviews| 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 b7527357ad472d9dca384c6fd6706e588ef13ff0..e3b07ec9b9e91211d2686cc13e165172821c25da 100644 |
| --- a/chrome/browser/ui/views/tabs/tab_drag_controller.cc |
| +++ b/chrome/browser/ui/views/tabs/tab_drag_controller.cc |
| @@ -587,9 +587,12 @@ TabDragController::DragBrowserToNewTabStrip( |
| return DRAG_BROWSER_RESULT_STOP; |
| } |
| +#if defined(USE_AURA) |
| + // Only Aura windows are gesture consumers. |
| ui::GestureRecognizer::Get()->TransferEventsTo( |
| GetAttachedBrowserWidget()->GetNativeView(), |
| target_tabstrip->GetWidget()->GetNativeView()); |
| +#endif |
|
tapted
2015/04/02 10:38:22
note that before r321128 these were #ifdef OS_WIN
|
| if (is_dragging_window_) { |
| // ReleaseCapture() is going to result in calling back to us (because it |
| @@ -1026,11 +1029,14 @@ void TabDragController::DetachIntoNewBrowserAndRunMoveLoop( |
| BrowserView* dragged_browser_view = |
| BrowserView::GetBrowserViewForBrowser(browser); |
| views::Widget* dragged_widget = dragged_browser_view->GetWidget(); |
| + |
| +#if defined(USE_AURA) |
| + // Only Aura windows are gesture consumers. |
| gfx::NativeView attached_native_view = |
| attached_tabstrip_->GetWidget()->GetNativeView(); |
| - |
| ui::GestureRecognizer::Get()->TransferEventsTo( |
| attached_native_view, dragged_widget->GetNativeView()); |
| +#endif |
| Detach(can_release_capture_ ? RELEASE_CAPTURE : DONT_RELEASE_CAPTURE); |