Nukes USE_AURA ifdefs from views

ui/views/widget/widget_interactive_uitest.cc

 // Copyright (c) 2013 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 "base/basictypes.h"
 #include "base/bind.h"
 #include "base/run_loop.h"
+#include "ui/aura/client/activation_client.h"
+#include "ui/aura/client/focus_client.h"
+#include "ui/aura/env.h"
+#include "ui/aura/window.h"
+#include "ui/aura/window_event_dispatcher.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/views/test/widget_test.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/dialog_delegate.h"
 
-#if defined(USE_AURA)
-#include "ui/aura/client/activation_client.h"
-#include "ui/aura/client/focus_client.h"
-#include "ui/aura/env.h"
-#include "ui/aura/window.h"
-#include "ui/aura/window_event_dispatcher.h"
-#endif
-
-#if defined(USE_AURA) && !defined(OS_CHROMEOS)
+#if !defined(OS_CHROMEOS)
 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
 #endif
 
 #if defined(OS_WIN)
 #include "ui/views/win/hwnd_util.h"
 #endif
 
 namespace views {
 namespace test {
 
@@ skipping 440 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(WidgetActivationTest);
 };
 
 // Tests whether the widget only becomes active when the underlying window
 // is really active.
 TEST_F(WidgetTest, WidgetNotActivatedOnFakeActivationMessages) {
   WidgetActivationTest widget1;
   Widget::InitParams init_params =
       CreateParams(Widget::InitParams::TYPE_WINDOW_FRAMELESS);
   init_params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
-#if defined(USE_AURA)
   init_params.native_widget = new DesktopNativeWidgetAura(&widget1);
-#endif
   init_params.bounds = gfx::Rect(0, 0, 200, 200);
   widget1.Init(init_params);
   widget1.Show();
   EXPECT_EQ(true, widget1.active());
 
   WidgetActivationTest widget2;
-#if defined(USE_AURA)
   init_params.native_widget = new DesktopNativeWidgetAura(&widget2);
-#endif
   widget2.Init(init_params);
   widget2.Show();
   EXPECT_EQ(true, widget2.active());
   EXPECT_EQ(false, widget1.active());
 
   HWND win32_native_window1 = HWNDForWidget(&widget1);
   EXPECT_TRUE(::IsWindow(win32_native_window1));
 
   ::SendMessage(win32_native_window1, WM_NCACTIVATE, 1, 0);
   EXPECT_EQ(false, widget1.active());
   EXPECT_EQ(true, widget2.active());
 
   ::SetActiveWindow(win32_native_window1);
   EXPECT_EQ(true, widget1.active());
   EXPECT_EQ(false, widget2.active());
 }
 #endif
 
-#if defined(USE_AURA) && !defined(OS_CHROMEOS)
+#if !defined(OS_CHROMEOS)
 // Provides functionality to create a window modal dialog.
 class ModalDialogDelegate : public DialogDelegateView {
  public:
   explicit ModalDialogDelegate(ui::ModalType type) : type_(type) {}
   virtual ~ModalDialogDelegate() {}
 
   // WidgetDelegate overrides.
   virtual ui::ModalType GetModalType() const OVERRIDE {
     return type_;
   }
@@ skipping 157 matching lines @@
     widget1.ReleaseCapture();
     EXPECT_FALSE(widget1.HasCapture());
     EXPECT_FALSE(widget2.HasCapture());
     EXPECT_TRUE(widget1.GetAndClearGotCaptureLost());
     EXPECT_FALSE(widget2.GetAndClearGotCaptureLost());
   }
 
  private:
   NativeWidget* CreateNativeWidget(bool create_desktop_native_widget,
                                    Widget* widget) {
-#if defined(USE_AURA) && !defined(OS_CHROMEOS)
+#if !defined(OS_CHROMEOS)
     if (create_desktop_native_widget)
       return new DesktopNativeWidgetAura(widget);
 #endif
     return NULL;
   }
 
   DISALLOW_COPY_AND_ASSIGN(WidgetCaptureTest);
 };
 
 // See description in TestCapture().
 TEST_F(WidgetCaptureTest, Capture) {
   TestCapture(false);
 }
 
-#if defined(USE_AURA) && !defined(OS_LINUX)
+#if !defined(OS_LINUX)
 // See description in TestCapture(). Creates DesktopNativeWidget.
 TEST_F(WidgetCaptureTest, CaptureDesktopNativeWidget) {
   TestCapture(true);
 }
 #endif
 
-#if defined(USE_AURA) && !defined(OS_CHROMEOS)
+#if !defined(OS_CHROMEOS)
 namespace {
 
 // Used to veirfy OnMouseEvent() has been invoked.
 class MouseEventTrackingWidget : public Widget {
  public:
   MouseEventTrackingWidget() : got_mouse_event_(false) {}
   virtual ~MouseEventTrackingWidget() {}
 
   bool GetAndClearGotMouseEvent() {
     bool value = got_mouse_event_;
     got_mouse_event_ = false;
     return value;
   }
 
   // Widget:
   virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE {
     got_mouse_event_ = true;
     Widget::OnMouseEvent(event);
   }
 
  private:
   bool got_mouse_event_;
 
   DISALLOW_COPY_AND_ASSIGN(MouseEventTrackingWidget);
 };
 
 }  // namespace
 
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_AURA)
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
 // TODO(erg): linux_aura bringup: http://crbug.com/163931
 #define MAYBE_MouseEventDispatchedToRightWindow \
   DISABLED_MouseEventDispatchedToRightWindow
 #else
 #define MAYBE_MouseEventDispatchedToRightWindow \
   MouseEventDispatchedToRightWindow
 #endif
 
 // Verifies if a mouse event is received on a widget that doesn't have capture
 // it is correctly processed by the widget that doesn't have capture.
@@ skipping 28 matching lines @@
   ui::EventDispatchDetails details = widget1.GetNativeWindow()->
       GetHost()->dispatcher()->OnEventFromSource(&mouse_event);
   ASSERT_FALSE(details.dispatcher_destroyed);
   EXPECT_TRUE(widget1.GetAndClearGotMouseEvent());
   EXPECT_FALSE(widget2.GetAndClearGotMouseEvent());
 }
 #endif
 
 }  // namespace test
 }  // namespace views