| Index: chrome/browser/ui/views/tabs/tab_drag_controller.cc
|
| ===================================================================
|
| --- chrome/browser/ui/views/tabs/tab_drag_controller.cc (revision 248569)
|
| +++ chrome/browser/ui/views/tabs/tab_drag_controller.cc (working copy)
|
| @@ -60,7 +60,7 @@
|
| #include "ui/events/gestures/gesture_recognizer.h"
|
| #endif
|
|
|
| -#if defined(OS_WIN) && defined(USE_AURA)
|
| +#if defined(OS_WIN)
|
| #include "ui/aura/window.h"
|
| #include "ui/events/gestures/gesture_recognizer.h"
|
| #endif
|
| @@ -958,7 +958,7 @@
|
| target_tabstrip->GetWidget()->SetCapture(attached_tabstrip_);
|
| else
|
| browser_widget->ReleaseCapture();
|
| -#if defined(OS_WIN) && defined(USE_AURA)
|
| +#if defined(OS_WIN)
|
| // The Gesture recognizer does not work well currently when capture changes
|
| // while a touch gesture is in progress. So we need to manually transfer
|
| // gesture sequence and the GR's touch events queue to the new window. This
|
| @@ -1459,7 +1459,7 @@
|
| gfx::Vector2d drag_offset;
|
| Browser* browser = CreateBrowserForDrag(
|
| attached_tabstrip_, point_in_screen, &drag_offset, &drag_bounds);
|
| -#if defined(OS_WIN) && defined(USE_AURA)
|
| +#if defined(OS_WIN)
|
| gfx::NativeView attached_native_view =
|
| attached_tabstrip_->GetWidget()->GetNativeView();
|
| #endif
|
| @@ -1468,7 +1468,7 @@
|
| BrowserView* dragged_browser_view =
|
| BrowserView::GetBrowserViewForBrowser(browser);
|
| views::Widget* dragged_widget = dragged_browser_view->GetWidget();
|
| -#if defined(OS_WIN) && defined(USE_AURA)
|
| +#if defined(OS_WIN)
|
| // The Gesture recognizer does not work well currently when capture changes
|
| // while a touch gesture is in progress. So we need to manually transfer
|
| // gesture sequence and the GR's touch events queue to the new window. This
|
|
|