Clean up some ifdefs around Win Aura.

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/tabs/tab_drag_controller.h"
 
 #include <math.h>
 #include <set>
 
 #include "base/auto_reset.h"
@@ skipping 42 matching lines @@
 #if defined(USE_ASH)
 #include "ash/accelerators/accelerator_commands.h"
 #include "ash/wm/coordinate_conversion.h"
 #include "ash/wm/window_state.h"
 #include "ui/aura/env.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #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
 
 using base::UserMetricsAction;
 using content::OpenURLParams;
 using content::WebContents;
 
 static const int kHorizontalMoveThreshold = 16;  // Pixels.
 
@@ skipping 877 matching lines @@
     attached_tabstrip_->ReleaseDragController();
     target_tabstrip->OwnDragController(this);
     // Disable animations so that we don't see a close animation on aero.
     browser_widget->SetVisibilityChangedAnimationsEnabled(false);
     // For aura we can't release capture, otherwise it'll cancel a gesture.
     // Instead we have to directly change capture.
     if (host_desktop_type_ == chrome::HOST_DESKTOP_TYPE_ASH)
       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
     // should really be done somewhere in capture change code and or inside the
     // GR. But we currently do not have a consistent way for doing it that would
     // work in all cases. Hence this hack.
     ui::GestureRecognizer::Get()->TransferEventsTo(
         browser_widget->GetNativeView(),
         target_tabstrip->GetWidget()->GetNativeView());
 #endif
@@ skipping 480 matching lines @@
     return;
   }
 
   const int last_tabstrip_width = attached_tabstrip_->tab_area_width();
   std::vector<gfx::Rect> drag_bounds = CalculateBoundsForDraggedTabs();
   OffsetX(GetAttachedDragPoint(point_in_screen).x(), &drag_bounds);
 
   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
   Detach(host_desktop_type_ == chrome::HOST_DESKTOP_TYPE_ASH ?
          DONT_RELEASE_CAPTURE : RELEASE_CAPTURE);
   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
     // should really be done somewhere in capture change code and or inside the
     // GR. But we currently do not have a consistent way for doing it that would
     // work in all cases. Hence this hack.
     ui::GestureRecognizer::Get()->TransferEventsTo(
         attached_native_view,
         dragged_widget->GetNativeView());
 #endif
@@ skipping 861 matching lines @@
 gfx::Vector2d TabDragController::GetWindowOffset(
     const gfx::Point& point_in_screen) {
   TabStrip* owning_tabstrip = (attached_tabstrip_ && detach_into_browser_) ?
       attached_tabstrip_ : source_tabstrip_;
   views::View* toplevel_view = owning_tabstrip->GetWidget()->GetContentsView();
 
   gfx::Point point = point_in_screen;
   views::View::ConvertPointFromScreen(toplevel_view, &point);
   return point.OffsetFromOrigin();
 }