Nukes USE_AURA ifdefs from views

No longer needed.

BUG=none
TEST=none
R=ben@chromium.org

Review URL: https://codereview.chromium.org/191723003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@255976 0039d316-1c4b-4281-b951-d872f2087c98

51 files changed, 102 insertions, 470 deletions

diff --git a/ui/views/accessibility/native_view_accessibility_win_unittest.cc b/ui/views/accessibility/native_view_accessibility_win_unittest.cc
index 5bd5bed..214dce8 100644
--- a/ui/views/accessibility/native_view_accessibility_win_unittest.cc
+++ b/ui/views/accessibility/native_view_accessibility_win_unittest.cc
@@ -91,7 +91,6 @@ TEST_F(NativeViewAcccessibilityWinTest, UnattachedWebView) {
   NativeViewAccessibility::UnregisterWebView(web_view);
 }
 
-#if defined(USE_AURA)
 TEST_F(NativeViewAcccessibilityWinTest, AuraOwnedWidgets) {
   Widget widget;
   Widget::InitParams init_params =
@@ -118,7 +117,6 @@ TEST_F(NativeViewAcccessibilityWinTest, AuraOwnedWidgets) {
   ASSERT_EQ(S_OK, root_view_accessible->get_accChildCount(&child_count));
   ASSERT_EQ(2L, child_count);
 }
-#endif
 
 }  // namespace test
 }  // namespace views
diff --git a/ui/views/accessible_pane_view_unittest.cc b/ui/views/accessible_pane_view_unittest.cc
index 75938c7..4468f2f 100644
--- a/ui/views/accessible_pane_view_unittest.cc
+++ b/ui/views/accessible_pane_view_unittest.cc
@@ -101,7 +101,6 @@ TEST_F(AccessiblePaneViewTest, SimpleSetPaneFocus) {
 
 // This test will not work properly in Windows because it uses ::GetNextWindow
 // on deactivate which is rather unpredictable where the focus will land.
-#if !defined(OS_WIN)||defined(USE_AURA)
 TEST_F(AccessiblePaneViewTest, SetPaneFocusAndRestore) {
   View* test_view_main = new View();
   scoped_ptr<Widget> widget_main(new Widget());
@@ -145,7 +144,6 @@ TEST_F(AccessiblePaneViewTest, SetPaneFocusAndRestore) {
   widget_main->CloseNow();
   widget_main.reset();
 }
-#endif  // !defined(OS_WIN)||defined(USE_AURA)
 
 TEST_F(AccessiblePaneViewTest, TwoSetPaneFocus) {
   TestBarView* test_view = new TestBarView();
diff --git a/ui/views/background.cc b/ui/views/background.cc
index b37318d..bb2ddd0 100644
--- a/ui/views/background.cc
+++ b/ui/views/background.cc
@@ -94,12 +94,7 @@ Background* Background::CreateSolidBackground(SkColor color) {
 //static
 Background* Background::CreateStandardPanelBackground() {
   // TODO(beng): Should be in NativeTheme.
-#if defined(USE_AURA)
   return CreateSolidBackground(SK_ColorWHITE);
-#else
-  return CreateVerticalGradientBackground(SkColorSetRGB(246, 250, 255),
-                                          SkColorSetRGB(219, 235, 255));
-#endif
 }
 
 //static
diff --git a/ui/views/bubble/bubble_delegate.cc b/ui/views/bubble/bubble_delegate.cc
index 009988f..ce0cf89 100644
--- a/ui/views/bubble/bubble_delegate.cc
+++ b/ui/views/bubble/bubble_delegate.cc
@@ -204,28 +204,10 @@ void BubbleDelegateView::OnBeforeBubbleWidgetInit(Widget::InitParams* params,
 }
 
 void BubbleDelegateView::StartFade(bool fade_in) {
-#if defined(USE_AURA)
-  // Use AURA's window layer animation instead of fading. This ensures that
-  // hosts which rely on the layer animation callbacks to close the window
-  // work correctly.
   if (fade_in)
     GetWidget()->Show();
   else
     GetWidget()->Close();
-#else
-  fade_animation_.reset(new gfx::SlideAnimation(this));
-  fade_animation_->SetSlideDuration(GetFadeDuration());
-  fade_animation_->Reset(fade_in ? 0.0 : 1.0);
-  if (fade_in) {
-    original_opacity_ = 0;
-    GetWidget()->SetOpacity(original_opacity_);
-    GetWidget()->Show();
-    fade_animation_->Show();
-  } else {
-    original_opacity_ = 255;
-    fade_animation_->Hide();
-  }
-#endif
 }
 
 void BubbleDelegateView::ResetFade() {
diff --git a/ui/views/bubble/bubble_delegate.h b/ui/views/bubble/bubble_delegate.h
index 2e2d677..3d92d0f 100644
--- a/ui/views/bubble/bubble_delegate.h
+++ b/ui/views/bubble/bubble_delegate.h
@@ -170,6 +170,7 @@ class VIEWS_EXPORT BubbleDelegateView : public WidgetDelegateView,
   void HandleVisibilityChanged(Widget* widget, bool visible);
 
   // Fade animation for bubble.
+  // TODO(sky): remove this, not needed anymore.
   scoped_ptr<gfx::SlideAnimation> fade_animation_;
 
   // Flags controlling bubble closure on the escape key and deactivation.
diff --git a/ui/views/controls/button/custom_button_unittest.cc b/ui/views/controls/button/custom_button_unittest.cc
index bc1931a..8483671 100644
--- a/ui/views/controls/button/custom_button_unittest.cc
+++ b/ui/views/controls/button/custom_button_unittest.cc
@@ -5,6 +5,9 @@
 #include "ui/views/controls/button/custom_button.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/aura/test/test_cursor_client.h"
+#include "ui/aura/window.h"
+#include "ui/aura/window_event_dispatcher.h"
 #include "ui/base/layout.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/controls/button/checkbox.h"
@@ -16,12 +19,6 @@
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/test/views_test_base.h"
 
-#if defined(USE_AURA)
-#include "ui/aura/test/test_cursor_client.h"
-#include "ui/aura/window.h"
-#include "ui/aura/window_event_dispatcher.h"
-#endif
-
 namespace views {
 
 namespace {
@@ -38,7 +35,6 @@ class TestCustomButton : public CustomButton {
   DISALLOW_COPY_AND_ASSIGN(TestCustomButton);
 };
 
-#if defined(USE_AURA)
 void PerformGesture(CustomButton* button, ui::EventType event_type) {
   ui::GestureEventDetails gesture_details(event_type, 0, 0);
   base::TimeDelta time_stamp = base::TimeDelta::FromMicroseconds(0);
@@ -46,7 +42,6 @@ void PerformGesture(CustomButton* button, ui::EventType event_type) {
                                  gesture_details, 1);
   button->OnGestureEvent(&gesture_event);
 }
-#endif  // USE_AURA
 
 }  // namespace
 
@@ -63,10 +58,8 @@ TEST_F(CustomButtonTest, HoverStateOnVisibilityChange) {
   widget->Init(params);
   widget->Show();
 
-#if defined(USE_AURA)
   aura::test::TestCursorClient cursor_client(
       widget->GetNativeView()->GetRootWindow());
-#endif
 
   // Position the widget in a way so that it is under the cursor.
   gfx::Point cursor = gfx::Screen::GetScreenFor(
@@ -101,7 +94,6 @@ TEST_F(CustomButtonTest, HoverStateOnVisibilityChange) {
   button->SetVisible(true);
   EXPECT_EQ(CustomButton::STATE_HOVERED, button->state());
 
-#if defined(USE_AURA)
   // In Aura views, no new hover effects are invoked if mouse events
   // are disabled.
   cursor_client.DisableMouseEvents();
@@ -117,10 +109,8 @@ TEST_F(CustomButtonTest, HoverStateOnVisibilityChange) {
 
   button->SetVisible(true);
   EXPECT_EQ(CustomButton::STATE_NORMAL, button->state());
-#endif
 }
 
-#if defined(USE_AURA)
 // Tests that gesture events correctly change the button state.
 TEST_F(CustomButtonTest, GestureEventsSetState) {
   // Create a widget so that the CustomButton can query the hover state
@@ -150,8 +140,6 @@ TEST_F(CustomButtonTest, GestureEventsSetState) {
   EXPECT_EQ(CustomButton::STATE_NORMAL, button->state());
 }
 
-#endif  // USE_AURA
-
 // Make sure all subclasses of CustomButton are correctly recognized
 // as CustomButton.
 TEST_F(CustomButtonTest, AsCustomButton) {
diff --git a/ui/views/controls/button/menu_button.cc b/ui/views/controls/button/menu_button.cc
index 6ad0aa2f..0f6a393 100644
--- a/ui/views/controls/button/menu_button.cc
+++ b/ui/views/controls/button/menu_button.cc
@@ -220,16 +220,12 @@ bool MenuButton::OnKeyPressed(const ui::KeyEvent& event) {
     case ui::VKEY_UP:
     case ui::VKEY_DOWN: {
       // WARNING: we may have been deleted by the time Activate returns.
-      bool ret = Activate();
-#if defined(USE_AURA)
-      // This is to prevent the keyboard event from being dispatched twice.
-      // The Activate function returns false in most cases. In AURA if the
-      // keyboard event is not handled, we pass it to the default handler
-      // which dispatches the event back to us causing the menu to get
-      // displayed again.
-      ret = true;
-#endif
-      return ret;
+      Activate();
+      // This is to prevent the keyboard event from being dispatched twice.  If
+      // the keyboard event is not handled, we pass it to the default handler
+      // which dispatches the event back to us causing the menu to get displayed
+      // again. Return true to prevent this.
+      return true;
     }
     default:
       break;
diff --git a/ui/views/controls/link.cc b/ui/views/controls/link.cc
index fc269e4..4d447fd 100644
--- a/ui/views/controls/link.cc
+++ b/ui/views/controls/link.cc
@@ -9,6 +9,7 @@
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/accessibility/ax_view_state.h"
+#include "ui/base/cursor/cursor.h"
 #include "ui/events/event.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/canvas.h"
@@ -16,10 +17,6 @@
 #include "ui/gfx/font_list.h"
 #include "ui/views/controls/link_listener.h"
 
-#if defined(USE_AURA)
-#include "ui/base/cursor/cursor.h"
-#endif
-
 namespace views {
 
 const char Link::kViewClassName[] = "Link";
diff --git a/ui/views/controls/menu/menu_config.h b/ui/views/controls/menu/menu_config.h
index fac60e8..2a62a5d 100644
--- a/ui/views/controls/menu/menu_config.h
+++ b/ui/views/controls/menu/menu_config.h
@@ -136,9 +136,7 @@ struct VIEWS_EXPORT MenuConfig {
   void Init(const ui::NativeTheme* theme);
 
   // TODO: temporary until we standardize.
-#if defined(USE_AURA)
   void InitAura(const ui::NativeTheme* theme);
-#endif
 };
 
 }  // namespace views
diff --git a/ui/views/controls/menu/menu_config_win.cc b/ui/views/controls/menu/menu_config_win.cc
index ab038a7..e43c758 100644
--- a/ui/views/controls/menu/menu_config_win.cc
+++ b/ui/views/controls/menu/menu_config_win.cc
@@ -13,11 +13,8 @@
 #include "base/win/win_util.h"
 #include "ui/base/l10n/l10n_util_win.h"
 #include "ui/gfx/color_utils.h"
-#include "ui/native_theme/native_theme_win.h"
-
-#if defined(USE_AURA)
 #include "ui/native_theme/native_theme_aura.h"
-#endif
+#include "ui/native_theme/native_theme_win.h"
 
 using ui::NativeTheme;
 using ui::NativeThemeWin;
@@ -25,12 +22,10 @@ using ui::NativeThemeWin;
 namespace views {
 
 void MenuConfig::Init(const NativeTheme* theme) {
-#if defined(USE_AURA)
   if (theme == ui::NativeThemeAura::instance()) {
     InitAura(theme);
     return;
   }
-#endif
   text_color = NativeThemeWin::instance()->GetThemeColorWithDefault(
       NativeThemeWin::MENU, MENU_POPUPITEM, MPI_NORMAL, TMT_TEXTCOLOR,
       COLOR_MENUTEXT);
diff --git a/ui/views/controls/menu/menu_controller.cc b/ui/views/controls/menu/menu_controller.cc
index ff3a5fe..6b5fc4e 100644
--- a/ui/views/controls/menu/menu_controller.cc
+++ b/ui/views/controls/menu/menu_controller.cc
@@ -13,6 +13,8 @@
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
+#include "ui/aura/env.h"
+#include "ui/aura/window_event_dispatcher.h"
 #include "ui/base/dragdrop/drag_utils.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "ui/base/l10n/l10n_util.h"
@@ -41,11 +43,6 @@
 #include "ui/views/widget/tooltip_manager.h"
 #include "ui/views/widget/widget.h"
 
-#if defined(USE_AURA)
-#include "ui/aura/env.h"
-#include "ui/aura/window_event_dispatcher.h"
-#endif
-
 #if defined(OS_WIN)
 #include "ui/views/win/hwnd_message_handler.h"
 #include "ui/views/win/hwnd_util.h"
@@ -935,7 +932,7 @@ void MenuController::SetSelectionOnPointerDown(SubmenuView* source,
     }
     Cancel(exit_type);
 
-#if defined(USE_AURA) && !defined(OS_WIN)
+#if !defined(OS_WIN)
     // We're going to exit the menu and want to repost the event so that is
     // is handled normally after the context menu has exited. We call
     // RepostEvent after Cancel so that mouse capture has been released so
diff --git a/ui/views/controls/menu/menu_host.cc b/ui/views/controls/menu/menu_host.cc
index 61e3f38..650b36e5 100644
--- a/ui/views/controls/menu/menu_host.cc
+++ b/ui/views/controls/menu/menu_host.cc
@@ -14,14 +14,11 @@
 #include "ui/views/controls/menu/menu_item_view.h"
 #include "ui/views/controls/menu/menu_scroll_view_container.h"
 #include "ui/views/controls/menu/submenu_view.h"
+#include "ui/views/corewm/shadow_types.h"
 #include "ui/views/round_rect_painter.h"
 #include "ui/views/widget/native_widget_private.h"
 #include "ui/views/widget/widget.h"
 
-#if defined(USE_AURA)
-#include "ui/views/corewm/shadow_types.h"
-#endif
-
 namespace views {
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -57,10 +54,8 @@ void MenuHost::InitMenuHost(Widget* parent,
   params.bounds = bounds;
   Init(params);
 
-#if defined(USE_AURA)
   if (bubble_border)
     SetShadowType(GetNativeView(), views::corewm::SHADOW_TYPE_NONE);
-#endif
 
   SetContentsView(contents_view);
   if (bubble_border || rounded_border)
@@ -78,11 +73,9 @@ void MenuHost::ShowMenuHost(bool do_capture) {
   base::AutoReset<bool> reseter(&ignore_capture_lost_, true);
   ShowInactive();
   if (do_capture) {
-#if defined(USE_AURA)
     // Cancel existing touches, so we don't miss some touch release/cancel
     // events due to the menu taking capture.
     ui::GestureRecognizer::Get()->TransferEventsTo(GetNativeWindow(), NULL);
-#endif  // USE_AURA
     native_widget_private()->SetCapture();
   }
 }
diff --git a/ui/views/controls/menu/menu_host_root_view.cc b/ui/views/controls/menu/menu_host_root_view.cc
index 2577d90..3bce4a4 100644
--- a/ui/views/controls/menu/menu_host_root_view.cc
+++ b/ui/views/controls/menu/menu_host_root_view.cc
@@ -51,17 +51,8 @@ void MenuHostRootView::OnMouseMoved(const ui::MouseEvent& event) {
 }
 
 bool MenuHostRootView::OnMouseWheel(const ui::MouseWheelEvent& event) {
-#if defined(USE_AURA)
-  // Aura uses MenuController to forward events like other mouse events.
   return GetMenuController() &&
       GetMenuController()->OnMouseWheel(submenu_, event);
-#else
-  // Windows uses focus_util_win::RerouteMouseWheel to forward events to
-  // the right menu.
-  // RootView::OnMouseWheel forwards to the focused view. We don't have a
-  // focused view, so we need to override this then forward to the menu.
-  return submenu_->OnMouseWheel(event);
-#endif
 }
 
 void MenuHostRootView::DispatchGestureEvent(ui::GestureEvent* event) {
diff --git a/ui/views/controls/menu/menu_runner.cc b/ui/views/controls/menu/menu_runner.cc
index a960349..18b3fcd 100644
--- a/ui/views/controls/menu/menu_runner.cc
+++ b/ui/views/controls/menu/menu_runner.cc
@@ -278,16 +278,6 @@ bool MenuRunnerImpl::ShouldShowMnemonics(MenuButton* button) {
   return show_mnemonics;
 }
 
-// In theory we could implement this every where, but for now we're only
-// implementing it on aura.
-#if !defined(USE_AURA)
-// static
-DisplayChangeListener* DisplayChangeListener::Create(Widget* widget,
-                                                     MenuRunner* runner) {
-  return NULL;
-}
-#endif
-
 }  // namespace internal
 
 MenuRunner::MenuRunner(ui::MenuModel* menu_model)
diff --git a/ui/views/controls/menu/menu_scroll_view_container.cc b/ui/views/controls/menu/menu_scroll_view_container.cc
index 4528bd4..f01bea6 100644
--- a/ui/views/controls/menu/menu_scroll_view_container.cc
+++ b/ui/views/controls/menu/menu_scroll_view_container.cc
@@ -8,6 +8,7 @@
 #include "third_party/skia/include/core/SkPath.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/gfx/canvas.h"
+#include "ui/native_theme/native_theme_aura.h"
 #include "ui/views/border.h"
 #include "ui/views/bubble/bubble_border.h"
 #include "ui/views/controls/menu/menu_config.h"
@@ -16,10 +17,6 @@
 #include "ui/views/controls/menu/submenu_view.h"
 #include "ui/views/round_rect_painter.h"
 
-#if defined(USE_AURA)
-#include "ui/native_theme/native_theme_aura.h"
-#endif
-
 using ui::NativeTheme;
 
 namespace views {
@@ -284,14 +281,12 @@ void MenuScrollViewContainer::CreateDefaultBorder() {
   int padding = menu_config.corner_radius > 0 ?
         kBorderPaddingDueToRoundedCorners : 0;
 
-#if defined(USE_AURA)
   if (menu_config.native_theme == ui::NativeThemeAura::instance()) {
     // In case of NativeThemeAura the border gets drawn with the shadow.
     // Furthermore no additional padding is wanted.
     use_border = false;
     padding = 0;
   }
-#endif
 
   int top = menu_config.menu_vertical_border_size + padding;
   int left = menu_config.menu_horizontal_border_size + padding;
diff --git a/ui/views/controls/menu/menu_separator.h b/ui/views/controls/menu/menu_separator.h
index 4098ae8..0967c4a 100644
--- a/ui/views/controls/menu/menu_separator.h
+++ b/ui/views/controls/menu/menu_separator.h
@@ -24,10 +24,8 @@ class MenuSeparator : public View {
   virtual gfx::Size GetPreferredSize() OVERRIDE;
 
  private:
-#if defined(USE_AURA)
   void OnPaintAura(gfx::Canvas* canvas);
   gfx::Size GetPreferredSizeAura();
-#endif
 
   // The type of the separator.
   const ui::MenuSeparatorType type_;
diff --git a/ui/views/controls/menu/menu_separator_win.cc b/ui/views/controls/menu/menu_separator_win.cc
index 6f95334..87d0a2b 100644
--- a/ui/views/controls/menu/menu_separator_win.cc
+++ b/ui/views/controls/menu/menu_separator_win.cc
@@ -11,24 +11,19 @@
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/rect.h"
 #include "ui/native_theme/native_theme.h"
+#include "ui/native_theme/native_theme_aura.h"
 #include "ui/views/controls/menu/menu_config.h"
 #include "ui/views/controls/menu/menu_item_view.h"
 
-#if defined(USE_AURA)
-#include "ui/native_theme/native_theme_aura.h"
-#endif
-
 namespace views {
 
 void MenuSeparator::OnPaint(gfx::Canvas* canvas) {
   const MenuConfig& config = parent_menu_item_->GetMenuConfig();
 
-#if defined(USE_AURA)
   if (config.native_theme == ui::NativeThemeAura::instance()) {
     OnPaintAura(canvas);
     return;
   }
-#endif
 
   int start_x = 0;
   if (config.render_gutter) {
@@ -55,10 +50,8 @@ void MenuSeparator::OnPaint(gfx::Canvas* canvas) {
 gfx::Size MenuSeparator::GetPreferredSize() {
   const MenuConfig& config = parent_menu_item_->GetMenuConfig();
 
-#if defined(USE_AURA)
   if (config.native_theme == ui::NativeThemeAura::instance())
     return GetPreferredSizeAura();
-#endif
 
   return gfx::Size(10,  // Just in case we're the only item in a menu.
                    config.separator_height);
diff --git a/ui/views/controls/native/native_view_host.cc b/ui/views/controls/native/native_view_host.cc
index 3529ff5..6940708 100644
--- a/ui/views/controls/native/native_view_host.cc
+++ b/ui/views/controls/native/native_view_host.cc
@@ -16,15 +16,10 @@ namespace views {
 const char NativeViewHost::kViewClassName[] = "NativeViewHost";
 const char kWidgetNativeViewHostKey[] = "WidgetNativeViewHost";
 
-#if defined(USE_AURA)
 // Views implementation draws the focus.
 // TODO(oshima): Eliminate this flag and consolidate
 // the focus border code.
 const bool NativeViewHost::kRenderNativeControlFocus = false;
-#else
-// static
-const bool NativeViewHost::kRenderNativeControlFocus = true;
-#endif
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeViewHost, public:
diff --git a/ui/views/controls/native/native_view_host_unittest.cc b/ui/views/controls/native/native_view_host_unittest.cc
index f30980b..2477824 100644
--- a/ui/views/controls/native/native_view_host_unittest.cc
+++ b/ui/views/controls/native/native_view_host_unittest.cc
@@ -4,19 +4,12 @@
 
 #include "ui/views/controls/native/native_view_host.h"
 
-#if defined(OS_WIN) && !defined(USE_AURA)
-#include <windows.h>
-#endif
-
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
+#include "ui/aura/window.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/widget/widget.h"
 
-#if defined(USE_AURA)
-#include "ui/aura/window.h"
-#endif
-
 namespace views {
 
 class NativeViewHostTest : public ViewsTestBase {
@@ -93,15 +86,9 @@ class NativeViewHierarchyChangedTestView : public View {
   DISALLOW_COPY_AND_ASSIGN(NativeViewHierarchyChangedTestView);
 };
 
-#if defined(USE_AURA)
 aura::Window* GetNativeParent(aura::Window* window) {
   return window->parent();
 }
-#elif defined(OS_WIN)
-HWND GetNativeParent(HWND window) {
-  return GetParent(window);
-}
-#endif
 
 class ViewHierarchyChangedTestHost : public NativeViewHost {
  public:
diff --git a/ui/views/controls/resize_area.cc b/ui/views/controls/resize_area.cc
index cc7edda..6c2f20c 100644
--- a/ui/views/controls/resize_area.cc
+++ b/ui/views/controls/resize_area.cc
@@ -6,13 +6,10 @@
 
 #include "base/logging.h"
 #include "ui/accessibility/ax_view_state.h"
+#include "ui/base/cursor/cursor.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/views/controls/resize_area_delegate.h"
 
-#if defined(USE_AURA)
-#include "ui/base/cursor/cursor.h"
-#endif
-
 namespace views {
 
 const char ResizeArea::kViewClassName[] = "ResizeArea";
@@ -33,14 +30,7 @@ const char* ResizeArea::GetClassName() const {
 }
 
 gfx::NativeCursor ResizeArea::GetCursor(const ui::MouseEvent& event) {
-  if (!enabled())
-    return gfx::kNullCursor;
-#if defined(USE_AURA)
-  return ui::kCursorEastWestResize;
-#elif defined(OS_WIN)
-  static HCURSOR g_resize_cursor = LoadCursor(NULL, IDC_SIZEWE);
-  return g_resize_cursor;
-#endif
+  return enabled() ? ui::kCursorEastWestResize : gfx::kNullCursor;
 }
 
 bool ResizeArea::OnMousePressed(const ui::MouseEvent& event) {
diff --git a/ui/views/controls/scrollbar/base_scroll_bar_button.cc b/ui/views/controls/scrollbar/base_scroll_bar_button.cc
index c0a9e51..0a765c4 100644
--- a/ui/views/controls/scrollbar/base_scroll_bar_button.cc
+++ b/ui/views/controls/scrollbar/base_scroll_bar_button.cc
@@ -35,13 +35,9 @@ void BaseScrollBarButton::OnMouseCaptureLost() {
 
 void BaseScrollBarButton::RepeaterNotifyClick() {
   // TODO(sky): See if we can convert to using |Screen| everywhere.
-#if defined(OS_WIN) && !defined(USE_AURA)
-  gfx::Point cursor_point(GetMessagePos());
-#else
   // TODO(scottmg): Native is wrong: http://crbug.com/133312
   gfx::Point cursor_point =
       gfx::Screen::GetNativeScreen()->GetCursorScreenPoint();
-#endif
   ui::MouseEvent event(ui::ET_MOUSE_RELEASED,
                        cursor_point, cursor_point,
                        ui::EF_LEFT_MOUSE_BUTTON,
diff --git a/ui/views/controls/single_split_view.cc b/ui/views/controls/single_split_view.cc
index d1db3db4..29b49a34 100644
--- a/ui/views/controls/single_split_view.cc
+++ b/ui/views/controls/single_split_view.cc
@@ -6,14 +6,11 @@
 
 #include "skia/ext/skia_utils_win.h"
 #include "ui/accessibility/ax_view_state.h"
+#include "ui/base/cursor/cursor.h"
 #include "ui/gfx/canvas.h"
 #include "ui/views/background.h"
 #include "ui/views/controls/single_split_view_listener.h"
 
-#if defined(USE_AURA)
-#include "ui/base/cursor/cursor.h"
-#endif
-
 namespace views {
 
 // static
@@ -91,14 +88,8 @@ gfx::Size SingleSplitView::GetPreferredSize() {
 gfx::NativeCursor SingleSplitView::GetCursor(const ui::MouseEvent& event) {
   if (!IsPointInDivider(event.location()))
     return gfx::kNullCursor;
-#if defined(USE_AURA)
   return is_horizontal_ ?
       ui::kCursorEastWestResize : ui::kCursorNorthSouthResize;
-#elif defined(OS_WIN)
-  static HCURSOR we_resize_cursor = LoadCursor(NULL, IDC_SIZEWE);
-  static HCURSOR ns_resize_cursor = LoadCursor(NULL, IDC_SIZENS);
-  return is_horizontal_ ? we_resize_cursor : ns_resize_cursor;
-#endif
 }
 
 int SingleSplitView::GetDividerSize() const {
diff --git a/ui/views/controls/table/table_header.cc b/ui/views/controls/table/table_header.cc
index c349a6e..9550f35 100644
--- a/ui/views/controls/table/table_header.cc
+++ b/ui/views/controls/table/table_header.cc
@@ -5,6 +5,7 @@
 #include "ui/views/controls/table/table_header.h"
 
 #include "third_party/skia/include/core/SkColor.h"
+#include "ui/base/cursor/cursor.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/text_utils.h"
 #include "ui/native_theme/native_theme.h"
@@ -12,10 +13,6 @@
 #include "ui/views/controls/table/table_utils.h"
 #include "ui/views/controls/table/table_view.h"
 
-#if defined(USE_AURA)
-#include "ui/base/cursor/cursor.h"
-#endif
-
 namespace views {
 
 namespace {
@@ -39,15 +36,6 @@ const SkColor kSeparatorColor = SkColorSetRGB(0xAA, 0xAA, 0xAA);
 // Size of the sort indicator (doesn't include padding).
 const int kSortIndicatorSize = 8;
 
-gfx::NativeCursor GetResizeCursor() {
-#if defined(USE_AURA)
-  return ui::kCursorColumnResize;
-#elif defined(OS_WIN)
-  static HCURSOR g_hand_cursor = LoadCursor(NULL, IDC_SIZEWE);
-  return g_hand_cursor;
-#endif
-}
-
 }  // namespace
 
 // static
@@ -176,7 +164,7 @@ gfx::Size TableHeader::GetPreferredSize() {
 
 gfx::NativeCursor TableHeader::GetCursor(const ui::MouseEvent& event) {
   return GetResizeColumn(GetMirroredXInView(event.x())) != -1 ?
-      GetResizeCursor() : View::GetCursor(event);
+      ui::kCursorColumnResize : View::GetCursor(event);
 }
 
 bool TableHeader::OnMousePressed(const ui::MouseEvent& event) {
diff --git a/ui/views/controls/webview/unhandled_keyboard_event_handler_win.cc b/ui/views/controls/webview/unhandled_keyboard_event_handler_win.cc
index c1148c7..463ef7e 100644
--- a/ui/views/controls/webview/unhandled_keyboard_event_handler_win.cc
+++ b/ui/views/controls/webview/unhandled_keyboard_event_handler_win.cc
@@ -57,13 +57,9 @@ void UnhandledKeyboardEventHandler::HandleKeyboardEvent(
 
   // Any unhandled keyboard/character messages should be defproced.
   // This allows stuff like F10, etc to work correctly.
-#if defined(USE_AURA)
   if (!event.os_event)
     return;
   const MSG& message(event.os_event->native_event());
-#else
-  const MSG& message(event.os_event);
-#endif
   DefWindowProc(message.hwnd, message.message, message.wParam, message.lParam);
 }
 
diff --git a/ui/views/controls/webview/web_dialog_view.cc b/ui/views/controls/webview/web_dialog_view.cc
index 4fed9cf..0cfaf8f 100644
--- a/ui/views/controls/webview/web_dialog_view.cc
+++ b/ui/views/controls/webview/web_dialog_view.cc
@@ -14,20 +14,16 @@
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
+#include "ui/events/event.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/views/controls/webview/webview.h"
 #include "ui/views/layout/fill_layout.h"
+#include "ui/views/widget/native_widget_aura.h"
 #include "ui/views/widget/root_view.h"
 #include "ui/views/widget/widget.h"
 #include "ui/web_dialogs/web_dialog_delegate.h"
 #include "ui/web_dialogs/web_dialog_ui.h"
 
-#if defined(USE_AURA)
-#include "ui/events/event.h"
-#include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
-#include "ui/views/widget/native_widget_aura.h"
-#endif
-
 using content::NativeWebKeyboardEvent;
 using content::WebContents;
 using content::WebUIMessageHandler;
@@ -282,7 +278,6 @@ void WebDialogView::MoveContents(WebContents* source, const gfx::Rect& pos) {
 // they're all browser-specific. (This may change in the future.)
 void WebDialogView::HandleKeyboardEvent(content::WebContents* source,
                                         const NativeWebKeyboardEvent& event) {
-#if defined(USE_AURA)
   if (!event.os_event)
     return;
   ui::KeyEvent aura_event(event.os_event->native_event(), false);
@@ -293,12 +288,6 @@ void WebDialogView::HandleKeyboardEvent(content::WebContents* source,
   if (event_handler)
     event_handler->OnKeyEvent(&aura_event);
 
-#elif defined(OS_WIN)
-  // Any unhandled keyboard/character messages should be defproced.
-  // This allows stuff like F10, etc to work correctly.
-  DefWindowProc(event.os_event.hwnd, event.os_event.message,
-                event.os_event.wParam, event.os_event.lParam);
-#endif
 }
 
 void WebDialogView::CloseContents(WebContents* source) {
diff --git a/ui/views/controls/webview/webview.cc b/ui/views/controls/webview/webview.cc
index 4669c3e..baa5e0e 100644
--- a/ui/views/controls/webview/webview.cc
+++ b/ui/views/controls/webview/webview.cc
@@ -254,21 +254,9 @@ void WebView::DetachWebContents() {
   if (web_contents()) {
     wcv_holder_->Detach();
 #if defined(OS_WIN)
-    if (!is_embedding_fullscreen_widget_) {
-#if !defined(USE_AURA)
-      // TODO(beng): This should either not be necessary, or be done implicitly
-      // by NativeViewHostWin on Detach(). As it stands, this is needed so that
-      // the of the detached contents knows to tell the renderer it's been
-      // hidden.
-      //
-      // Moving this out of here would also mean we wouldn't be potentially
-      // calling member functions on a half-destroyed WebContents.
-      ShowWindow(web_contents()->GetView()->GetNativeView(), SW_HIDE);
-#else
+    if (!is_embedding_fullscreen_widget_)
       web_contents()->SetParentNativeViewAccessible(NULL);
 #endif
-    }
-#endif
   }
 }
 
diff --git a/ui/views/drag_utils.cc b/ui/views/drag_utils.cc
index a3307be..27f6d58 100644
--- a/ui/views/drag_utils.cc
+++ b/ui/views/drag_utils.cc
@@ -4,27 +4,17 @@
 
 #include "ui/views/drag_utils.h"
 
-#include "ui/gfx/canvas.h"
-#include "ui/gfx/size.h"
-
-#if defined(USE_AURA)
 #include "ui/aura/client/drag_drop_client.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
+#include "ui/gfx/canvas.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/screen.h"
+#include "ui/gfx/size.h"
 #include "ui/views/widget/widget.h"
-#elif defined(OS_WIN)
-#include "ui/base/dragdrop/drag_drop_types.h"
-#include "ui/base/dragdrop/drag_source_win.h"
-#include "ui/base/dragdrop/os_exchange_data_provider_win.h"
-#else
-#error
-#endif
 
 float GetDeviceScaleForNativeView(views::Widget* widget) {
   float device_scale = 1.0f;
-#if defined(USE_AURA)
   // The following code should work on other platforms as well. But we do not
   // yet care about device scale factor on other platforms. So to keep drag and
   // drop behavior on other platforms un-touched, we wrap this in the #if guard.
@@ -34,7 +24,6 @@ float GetDeviceScaleForNativeView(views::Widget* widget) {
         GetDisplayNearestWindow(view);
     device_scale = display.device_scale_factor();
   }
-#endif
   return device_scale;
 }
 
@@ -45,7 +34,6 @@ void RunShellDrag(gfx::NativeView view,
                   const gfx::Point& location,
                   int operation,
                   ui::DragDropTypes::DragEventSource source) {
-#if defined(USE_AURA)
   gfx::Point root_location(location);
   aura::Window* root_window = view->GetRootWindow();
   aura::Window::ConvertPointToTarget(view, root_window, &root_location);
@@ -53,14 +41,6 @@ void RunShellDrag(gfx::NativeView view,
     aura::client::GetDragDropClient(root_window)->StartDragAndDrop(
         data, root_window, view, root_location, operation, source);
   }
-#elif defined(OS_WIN)
-  scoped_refptr<ui::DragSourceWin> drag_source(new ui::DragSourceWin);
-  DWORD effects;
-  DoDragDrop(ui::OSExchangeDataProviderWin::GetIDataObject(data),
-             drag_source,
-             ui::DragDropTypes::DragOperationToDropEffect(operation),
-             &effects);
-#endif
 }
 
 gfx::Canvas* GetCanvasForDragImage(views::Widget* widget,
diff --git a/ui/views/event_utils_win.cc b/ui/views/event_utils_win.cc
index fa7e5d2..78cb9df 100644
--- a/ui/views/event_utils_win.cc
+++ b/ui/views/event_utils_win.cc
@@ -13,13 +13,8 @@
 
 namespace views {
 
-#if defined(USE_AURA)
 bool RepostLocatedEventWin(HWND window,
                            const ui::LocatedEvent& event) {
-#else
-bool RepostLocatedEvent(gfx::NativeWindow window,
-                        const ui::LocatedEvent& event) {
-#endif
   if (!window)
     return false;
 
diff --git a/ui/views/examples/content_client/examples_browser_main_parts.cc b/ui/views/examples/content_client/examples_browser_main_parts.cc
index fadf23e..2b4fd6b 100644
--- a/ui/views/examples/content_client/examples_browser_main_parts.cc
+++ b/ui/views/examples/content_client/examples_browser_main_parts.cc
@@ -13,18 +13,15 @@
 #include "base/threading/thread_restrictions.h"
 #include "content/public/common/content_switches.h"
 #include "content/shell/browser/shell_browser_context.h"
-#include "ui/base/ime/input_method_initializer.h"
-#include "ui/views/examples/examples_window_with_content.h"
-#include "ui/views/test/desktop_test_views_delegate.h"
-#include "url/gurl.h"
-
-#if defined(USE_AURA)
 #include "ui/aura/env.h"
+#include "ui/base/ime/input_method_initializer.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/corewm/wm_state.h"
+#include "ui/views/examples/examples_window_with_content.h"
+#include "ui/views/test/desktop_test_views_delegate.h"
 #include "ui/views/widget/desktop_aura/desktop_screen.h"
 #include "ui/views/widget/native_widget_aura.h"
-#endif
+#include "url/gurl.h"
 
 #if defined(OS_CHROMEOS)
 #include "ui/aura/test/test_screen.h"
@@ -44,9 +41,7 @@ ExamplesBrowserMainParts::~ExamplesBrowserMainParts() {
 }
 
 void ExamplesBrowserMainParts::ToolkitInitialized() {
-#if defined(USE_AURA)
   wm_state_.reset(new views::corewm::WMState);
-#endif
 }
 
 void ExamplesBrowserMainParts::PreMainMessageLoopRun() {
@@ -63,7 +58,7 @@ void ExamplesBrowserMainParts::PreMainMessageLoopRun() {
   wm_test_helper_->host()->Show();
   // Ensure Aura knows where to open new windows.
   window_context = wm_test_helper_->host()->window();
-#elif defined(USE_AURA)
+#else
   aura::Env::CreateInstance();
   gfx::Screen::SetScreenInstance(
       gfx::SCREEN_TYPE_NATIVE, CreateDesktopScreen());
@@ -80,9 +75,7 @@ void ExamplesBrowserMainParts::PostMainMessageLoopRun() {
   wm_test_helper_.reset();
 #endif
   views_delegate_.reset();
-#if defined(USE_AURA)
   aura::Env::DeleteInstance();
-#endif
 }
 
 bool ExamplesBrowserMainParts::MainMessageLoopRun(int* result_code) {
diff --git a/ui/views/examples/content_client/examples_browser_main_parts.h b/ui/views/examples/content_client/examples_browser_main_parts.h
index 0c929ad..65d7431 100644
--- a/ui/views/examples/content_client/examples_browser_main_parts.h
+++ b/ui/views/examples/content_client/examples_browser_main_parts.h
@@ -53,9 +53,7 @@ class ExamplesBrowserMainParts : public content::BrowserMainParts {
   scoped_ptr<wm::WMTestHelper> wm_test_helper_;
 #endif
 
-#if defined(USE_AURA)
   scoped_ptr<views::corewm::WMState> wm_state_;
-#endif
 
   DISALLOW_COPY_AND_ASSIGN(ExamplesBrowserMainParts);
 };
diff --git a/ui/views/focus/focus_manager_test.cc b/ui/views/focus/focus_manager_test.cc
index 528f345..6debc79 100644
--- a/ui/views/focus/focus_manager_test.cc
+++ b/ui/views/focus/focus_manager_test.cc
@@ -100,24 +100,6 @@ void FocusManagerTest::SetAccessiblePanes(const std::vector<View*>& panes) {
   accessible_panes_ = panes;
 }
 
-#if defined(OS_WIN) && !defined(USE_AURA)
-void FocusManagerTest::SimulateActivateWindow() {
-  SendMessage(GetWidget()->GetNativeWindow(), WM_ACTIVATE, WA_ACTIVE, NULL);
-}
-
-void FocusManagerTest::SimulateDeactivateWindow() {
-  SendMessage(GetWidget()->GetNativeWindow(), WM_ACTIVATE, WA_INACTIVE, NULL);
-}
-
-void FocusManagerTest::PostKeyDown(ui::KeyboardCode key_code) {
-  PostMessage(GetWidget()->GetNativeView(), WM_KEYDOWN, key_code, 0);
-}
-
-void FocusManagerTest::PostKeyUp(ui::KeyboardCode key_code) {
-  PostMessage(GetWidget()->GetNativeView(), WM_KEYUP, key_code, 0);
-}
-#endif
-
 ////////////////////////////////////////////////////////////////////////////////
 // TestFocusChangeListener
 
diff --git a/ui/views/focus/focus_manager_test.h b/ui/views/focus/focus_manager_test.h
index 4afbf4f..e541386 100644
--- a/ui/views/focus/focus_manager_test.h
+++ b/ui/views/focus/focus_manager_test.h
@@ -43,15 +43,6 @@ class FocusManagerTest : public ViewsTestBase, public WidgetDelegate {
   // For testing FocusManager::RotatePaneFocus().
   void SetAccessiblePanes(const std::vector<View*>& panes);
 
-#if defined(OS_WIN) && !defined(USE_AURA)
-  // Mocks activating/deactivating the window.
-  void SimulateActivateWindow();
-  void SimulateDeactivateWindow();
-
-  void PostKeyDown(ui::KeyboardCode key_code);
-  void PostKeyUp(ui::KeyboardCode key_code);
-#endif
-
  private:
   View* contents_view_;
   FocusChangeListener* focus_change_listener_;
diff --git a/ui/views/focus/focus_manager_unittest.cc b/ui/views/focus/focus_manager_unittest.cc
index 792af2b..9bd988d 100644
--- a/ui/views/focus/focus_manager_unittest.cc
+++ b/ui/views/focus/focus_manager_unittest.cc
@@ -6,6 +6,8 @@
 #include <vector>
 
 #include "base/strings/utf_string_conversions.h"
+#include "ui/aura/client/focus_client.h"
+#include "ui/aura/window.h"
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/views/accessible_pane_view.h"
@@ -16,23 +18,8 @@
 #include "ui/views/focus/widget_focus_manager.h"
 #include "ui/views/widget/widget.h"
 
-#if defined(USE_AURA)
-#include "ui/aura/client/focus_client.h"
-#include "ui/aura/window.h"
-#endif
-
 namespace views {
 
-void FocusNativeView(gfx::NativeView view) {
-#if defined(USE_AURA)
-  aura::client::GetFocusClient(view)->FocusWindow(view);
-#elif defined(OS_WIN)
-  SetFocus(view);
-#else
-#error
-#endif
-}
-
 enum FocusTestEventType {
   ON_FOCUS = 0,
   ON_BLUR
@@ -148,14 +135,14 @@ TEST_F(FocusManagerTest, WidgetFocusChangeListener) {
 
   widget_listener.ClearFocusChanges();
   gfx::NativeView native_view1 = widget1->GetNativeView();
-  FocusNativeView(native_view1);
+  aura::client::GetFocusClient(native_view1)->FocusWindow(native_view1);
   ASSERT_EQ(2, static_cast<int>(widget_listener.focus_changes().size()));
   EXPECT_EQ(native_view1, widget_listener.focus_changes()[0].second);
   EXPECT_EQ(native_view1, widget_listener.focus_changes()[1].second);
 
   widget_listener.ClearFocusChanges();
   gfx::NativeView native_view2 = widget2->GetNativeView();
-  FocusNativeView(native_view2);
+  aura::client::GetFocusClient(native_view2)->FocusWindow(native_view2);
   ASSERT_EQ(2, static_cast<int>(widget_listener.focus_changes().size()));
   EXPECT_EQ(NativeViewPair(native_view1, native_view2),
             widget_listener.focus_changes()[0]);
@@ -566,25 +553,6 @@ class FocusManagerDtorTest : public FocusManagerTest {
   DtorTrackVector dtor_tracker_;
 };
 
-#if !defined(USE_AURA)
-TEST_F(FocusManagerDtorTest, FocusManagerDestructedLast) {
-  // Setup views hierarchy.
-  GetContentsView()->AddChildView(new Textfield());
-  GetContentsView()->AddChildView(new LabelButtonDtorTracked(
-      base::ASCIIToUTF16("button"), &dtor_tracker_));
-
-  // Close the window.
-  GetWidget()->Close();
-  RunPendingMessages();
-
-  // Test window, button and focus manager should all be destructed.
-  ASSERT_EQ(3, static_cast<int>(dtor_tracker_.size()));
-
-  // Focus manager should be the last one to destruct.
-  ASSERT_STREQ("FocusManagerDtorTracked", dtor_tracker_[2].c_str());
-}
-#endif
-
 namespace {
 
 class FocusInAboutToRequestFocusFromTabTraversalView : public View {
diff --git a/ui/views/focus/focus_traversal_unittest.cc b/ui/views/focus/focus_traversal_unittest.cc
index f9c81b1..6f0ba34 100644
--- a/ui/views/focus/focus_traversal_unittest.cc
+++ b/ui/views/focus/focus_traversal_unittest.cc
@@ -158,11 +158,7 @@ class BorderView : public NativeViewHost {
       if (!widget_) {
         widget_ = new Widget;
         Widget::InitParams params(Widget::InitParams::TYPE_CONTROL);
-#if defined(OS_WIN) || defined(USE_AURA)
         params.parent = details.parent->GetWidget()->GetNativeView();
-#else
-        NOTREACHED();
-#endif
         widget_->Init(params);
         widget_->SetFocusTraversableParentView(this);
         widget_->SetContentsView(child_);
diff --git a/ui/views/mouse_watcher.cc b/ui/views/mouse_watcher.cc
index 40ed383..ba0ea36 100644
--- a/ui/views/mouse_watcher.cc
+++ b/ui/views/mouse_watcher.cc
@@ -9,16 +9,13 @@
 #include "base/event_types.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
-#include "ui/events/event_constants.h"
-#include "ui/events/event_utils.h"
-#include "ui/gfx/screen.h"
-
-#if defined(USE_AURA)
 #include "ui/aura/env.h"
 #include "ui/aura/window.h"
 #include "ui/events/event.h"
+#include "ui/events/event_constants.h"
 #include "ui/events/event_handler.h"
-#endif
+#include "ui/events/event_utils.h"
+#include "ui/gfx/screen.h"
 
 namespace views {
 
diff --git a/ui/views/test/desktop_test_views_delegate.cc b/ui/views/test/desktop_test_views_delegate.cc
index 74a586b..b71b0f3 100644
--- a/ui/views/test/desktop_test_views_delegate.cc
+++ b/ui/views/test/desktop_test_views_delegate.cc
@@ -19,7 +19,7 @@ DesktopTestViewsDelegate::~DesktopTestViewsDelegate() {}
 void DesktopTestViewsDelegate::OnBeforeWidgetInit(
     Widget::InitParams* params,
     internal::NativeWidgetDelegate* delegate) {
-#if defined(USE_AURA) && !defined(OS_CHROMEOS)
+#if !defined(OS_CHROMEOS)
   // If we already have a native_widget, we don't have to try to come
   // up with one.
   if (params->native_widget)
diff --git a/ui/views/test/test_views_delegate.cc b/ui/views/test/test_views_delegate.cc
index dc56473..b299ceb 100644
--- a/ui/views/test/test_views_delegate.cc
+++ b/ui/views/test/test_views_delegate.cc
@@ -7,25 +7,20 @@
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "content/public/test/web_contents_tester.h"
+#include "ui/views/corewm/wm_state.h"
 
-#if defined(USE_AURA) && !defined(OS_CHROMEOS)
+#if !defined(OS_CHROMEOS)
 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
 #include "ui/views/widget/native_widget_aura.h"
 #endif
 
-#if defined(USE_AURA)
-#include "ui/views/corewm/wm_state.h"
-#endif
-
 namespace views {
 
 TestViewsDelegate::TestViewsDelegate()
     : use_transparent_windows_(false) {
   DCHECK(!ViewsDelegate::views_delegate);
   ViewsDelegate::views_delegate = this;
-#if defined(USE_AURA)
   wm_state_.reset(new views::corewm::WMState);
-#endif
 }
 
 TestViewsDelegate::~TestViewsDelegate() {
diff --git a/ui/views/test/test_views_delegate.h b/ui/views/test/test_views_delegate.h
index 9f14ed5..deaab99 100644
--- a/ui/views/test/test_views_delegate.h
+++ b/ui/views/test/test_views_delegate.h
@@ -76,9 +76,7 @@ class TestViewsDelegate : public ViewsDelegate {
  private:
   bool use_transparent_windows_;
 
-#if defined(USE_AURA)
   scoped_ptr<views::corewm::WMState> wm_state_;
-#endif
 
   DISALLOW_COPY_AND_ASSIGN(TestViewsDelegate);
 };
diff --git a/ui/views/test/widget_test.cc b/ui/views/test/widget_test.cc
index 18d1b14..fe9753d 100644
--- a/ui/views/test/widget_test.cc
+++ b/ui/views/test/widget_test.cc
@@ -10,12 +10,11 @@
 namespace views {
 namespace test {
 
-// A widget that assumes mouse capture always works. It won't on Aura in
-// testing, so we mock it.
-#if defined(USE_AURA)
+// A widget that assumes mouse capture always works. It won't in testing, so we
+// mock it.
 NativeWidgetCapture::NativeWidgetCapture(
     internal::NativeWidgetDelegate* delegate)
-    : NativeWidgetPlatform(delegate),
+    : NativeWidgetAura(delegate),
       mouse_capture_(false) {}
 NativeWidgetCapture::~NativeWidgetCapture() {}
 
@@ -32,14 +31,13 @@ void NativeWidgetCapture::ReleaseCapture() {
 bool NativeWidgetCapture::HasCapture() const {
   return mouse_capture_;
 }
-#endif
 
 WidgetTest::WidgetTest() {}
 WidgetTest::~WidgetTest() {}
 
 NativeWidget* WidgetTest::CreatePlatformNativeWidget(
     internal::NativeWidgetDelegate* delegate) {
-  return new NativeWidgetPlatformForTest(delegate);
+  return new NativeWidgetCapture(delegate);
 }
 
 Widget* WidgetTest::CreateTopLevelPlatformWidget() {
diff --git a/ui/views/test/widget_test.h b/ui/views/test/widget_test.h
index 6766370..dbb8abb 100644
--- a/ui/views/test/widget_test.h
+++ b/ui/views/test/widget_test.h
@@ -7,10 +7,7 @@
 
 #include "ui/gfx/native_widget_types.h"
 #include "ui/views/test/views_test_base.h"
-
-#if defined(USE_AURA)
 #include "ui/views/widget/native_widget_aura.h"
-#endif
 
 namespace views {
 
@@ -25,14 +22,9 @@ class RootView;
 
 namespace test {
 
-#if defined(USE_AURA)
-// A typedef that inserts our mock-capture NativeWidget implementation for
-// relevant platforms.
-typedef NativeWidgetAura NativeWidgetPlatform;
-
 // A widget that assumes mouse capture always works. It won't on Aura in
 // testing, so we mock it.
-class NativeWidgetCapture : public NativeWidgetPlatform {
+class NativeWidgetCapture : public NativeWidgetAura {
  public:
   explicit NativeWidgetCapture(internal::NativeWidgetDelegate* delegate);
   virtual ~NativeWidgetCapture();
@@ -47,10 +39,6 @@ class NativeWidgetCapture : public NativeWidgetPlatform {
   DISALLOW_COPY_AND_ASSIGN(NativeWidgetCapture);
 };
 
-// A generic typedef to pick up relevant NativeWidget implementations.
-typedef NativeWidgetCapture NativeWidgetPlatformForTest;
-#endif
-
 class WidgetTest : public ViewsTestBase {
  public:
   WidgetTest();
diff --git a/ui/views/touchui/touch_selection_controller_impl.cc b/ui/views/touchui/touch_selection_controller_impl.cc
index 5d9eab2..a6ae6d6 100644
--- a/ui/views/touchui/touch_selection_controller_impl.cc
+++ b/ui/views/touchui/touch_selection_controller_impl.cc
@@ -72,9 +72,7 @@ views::Widget* CreateTouchSelectionPopupWidget(
   params.context = context;
   params.delegate = widget_delegate;
   widget->Init(params);
-#if defined(USE_AURA)
   SetShadowType(widget->GetNativeView(), views::corewm::SHADOW_TYPE_NONE);
-#endif
   return widget;
 }
 
diff --git a/ui/views/touchui/touch_selection_controller_impl_unittest.cc b/ui/views/touchui/touch_selection_controller_impl_unittest.cc
index 729e20f..d572052 100644
--- a/ui/views/touchui/touch_selection_controller_impl_unittest.cc
+++ b/ui/views/touchui/touch_selection_controller_impl_unittest.cc
@@ -5,6 +5,8 @@
 #include "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
 #include "grit/ui_resources.h"
+#include "ui/aura/test/event_generator.h"
+#include "ui/aura/window.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/touch/touch_editing_controller.h"
 #include "ui/base/ui_base_switches.h"
@@ -17,11 +19,6 @@
 #include "ui/views/touchui/touch_selection_controller_impl.h"
 #include "ui/views/widget/widget.h"
 
-#if defined(USE_AURA)
-#include "ui/aura/test/event_generator.h"
-#include "ui/aura/window.h"
-#endif
-
 using base::ASCIIToUTF16;
 using base::UTF16ToUTF8;
 using base::WideToUTF16;
@@ -465,7 +462,6 @@ TEST_F(TouchSelectionControllerImplTest,
   }
 }
 
-#if defined(USE_AURA)
 TEST_F(TouchSelectionControllerImplTest,
        DoubleTapInTextfieldWithCursorHandleShouldSelectWord) {
   CreateTextfield();
@@ -490,6 +486,5 @@ TEST_F(TouchSelectionControllerImplTest,
   EXPECT_TRUE(textfield_->HasSelection());
   VERIFY_HANDLE_POSITIONS(false);
 }
-#endif
 
 }  // namespace views
diff --git a/ui/views/view.cc b/ui/views/view.cc
index 40ac67b..ff0b8c5 100644
--- a/ui/views/view.cc
+++ b/ui/views/view.cc
@@ -17,6 +17,7 @@
 #include "base/strings/utf_string_conversions.h"
 #include "third_party/skia/include/core/SkRect.h"
 #include "ui/accessibility/ax_enums.h"
+#include "ui/base/cursor/cursor.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/ui_base_switches_util.h"
 #include "ui/compositor/compositor.h"
@@ -47,10 +48,6 @@
 #include "ui/views/widget/tooltip_manager.h"
 #include "ui/views/widget/widget.h"
 
-#if defined(USE_AURA)
-#include "ui/base/cursor/cursor.h"
-#endif
-
 #if defined(OS_WIN)
 #include "base/win/scoped_gdi_object.h"
 #endif
@@ -59,11 +56,8 @@ namespace {
 
 // Whether to use accelerated compositing when necessary (e.g. when a view has a
 // transformation).
-#if defined(USE_AURA)
+// TODO(sky): nuke this as its always true now.
 bool use_acceleration_when_possible = true;
-#else
-bool use_acceleration_when_possible = false;
-#endif
 
 #if defined(OS_WIN)
 const bool kContextMenuOnMousePress = false;
@@ -930,16 +924,11 @@ View* View::GetTooltipHandlerForPoint(const gfx::Point& point) {
 
 gfx::NativeCursor View::GetCursor(const ui::MouseEvent& event) {
 #if defined(OS_WIN)
-#if defined(USE_AURA)
   static ui::Cursor arrow;
   if (!arrow.platform())
     arrow.SetPlatformCursor(LoadCursor(NULL, IDC_ARROW));
   return arrow;
 #else
-  static HCURSOR arrow = LoadCursor(NULL, IDC_ARROW);
-  return arrow;
-#endif
-#else
   return gfx::kNullCursor;
 #endif
 }
@@ -956,18 +945,11 @@ bool View::HitTestRect(const gfx::Rect& rect) const {
       if (!views::UsePointBasedTargeting(rect))
         source = HIT_TEST_SOURCE_TOUCH;
       GetHitTestMask(source, &mask);
-#if defined(USE_AURA)
-      // TODO: should we use this every where?
       SkRegion clip_region;
       clip_region.setRect(0, 0, width(), height());
       SkRegion mask_region;
       return mask_region.setPath(mask, clip_region) &&
              mask_region.intersects(RectToSkIRect(rect));
-#elif defined(OS_WIN)
-      base::win::ScopedRegion rgn(mask.CreateNativeRegion());
-      const RECT r(rect.ToRECT());
-      return RectInRegion(rgn, &r) != 0;
-#endif
     }
     // No mask, but inside our bounds.
     return true;
diff --git a/ui/views/view_unittest.cc b/ui/views/view_unittest.cc
index b1d94ea..021469f 100644
--- a/ui/views/view_unittest.cc
+++ b/ui/views/view_unittest.cc
@@ -9,6 +9,7 @@
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "grit/ui_strings.h"
+#include "ui/aura/window_event_dispatcher.h"
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/l10n/l10n_util.h"
@@ -17,6 +18,7 @@
 #include "ui/compositor/layer_animator.h"
 #include "ui/compositor/test/draw_waiter_for_test.h"
 #include "ui/events/event.h"
+#include "ui/events/gestures/gesture_recognizer.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/path.h"
@@ -37,10 +39,6 @@
 #if defined(OS_WIN)
 #include "ui/views/test/test_views_delegate.h"
 #endif
-#if defined(USE_AURA)
-#include "ui/aura/window_event_dispatcher.h"
-#include "ui/events/gestures/gesture_recognizer.h"
-#endif
 
 using base::ASCIIToUTF16;
 
@@ -1585,7 +1583,9 @@ bool TestView::AcceleratorPressed(const ui::Accelerator& accelerator) {
   return true;
 }
 
-#if defined(OS_WIN) && !defined(USE_AURA)
+// TODO: these tests were initially commented out when getting aura to
+// run. Figure out if still valuable and either nuke or fix.
+#if defined(false)
 TEST_F(ViewTest, ActivateAccelerator) {
   // Register a keyboard accelerator before the view is added to a window.
   ui::Accelerator return_accelerator(ui::VKEY_RETURN, ui::EF_NONE);
@@ -1650,9 +1650,7 @@ TEST_F(ViewTest, ActivateAccelerator) {
 
   widget->CloseNow();
 }
-#endif
 
-#if defined(OS_WIN) && !defined(USE_AURA)
 TEST_F(ViewTest, HiddenViewWithAccelerator) {
   ui::Accelerator return_accelerator(ui::VKEY_RETURN, ui::EF_NONE);
   TestView* view = new TestView();
@@ -1680,9 +1678,7 @@ TEST_F(ViewTest, HiddenViewWithAccelerator) {
 
   widget->CloseNow();
 }
-#endif
 
-#if defined(OS_WIN) && !defined(USE_AURA)
 TEST_F(ViewTest, ViewInHiddenWidgetWithAccelerator) {
   ui::Accelerator return_accelerator(ui::VKEY_RETURN, ui::EF_NONE);
   TestView* view = new TestView();
@@ -1714,9 +1710,7 @@ TEST_F(ViewTest, ViewInHiddenWidgetWithAccelerator) {
 
   widget->CloseNow();
 }
-#endif
 
-#if defined(OS_WIN) && !defined(USE_AURA)
 ////////////////////////////////////////////////////////////////////////////////
 // Mouse-wheel message rerouting
 ////////////////////////////////////////////////////////////////////////////////
@@ -1796,7 +1790,7 @@ TEST_F(ViewTest, DISABLED_RerouteMouseWheelTest) {
   window1->CloseNow();
   window2->CloseNow();
 }
-#endif
+#endif  // false
 
 ////////////////////////////////////////////////////////////////////////////////
 // Native view hierachy
@@ -2960,8 +2954,6 @@ TEST_F(ViewTest, AddExistingChild) {
 // Layers
 ////////////////////////////////////////////////////////////////////////////////
 
-#if defined(USE_AURA)
-
 namespace {
 
 // Test implementation of LayerAnimator.
@@ -3546,8 +3538,6 @@ TEST_F(ViewLayerTest, RecreateLayerZOrderWidgetParent) {
   EXPECT_EQ(v1_old_layer, child_layers_post[2]);
 }
 
-#endif  // USE_AURA
-
 TEST_F(ViewTest, FocusableAssertions) {
   // View subclasses may change insets based on whether they are focusable,
   // which effects the preferred size. To avoid preferred size changing around
diff --git a/ui/views/widget/desktop_aura/desktop_drag_drop_client_win.h b/ui/views/widget/desktop_aura/desktop_drag_drop_client_win.h
index 042a5a8..eda12e0 100644
--- a/ui/views/widget/desktop_aura/desktop_drag_drop_client_win.h
+++ b/ui/views/widget/desktop_aura/desktop_drag_drop_client_win.h
@@ -15,7 +15,6 @@ class DragSourceWin;
 }
 
 namespace views {
-class DesktopDragDragSourceWin;
 class DesktopDropTargetWin;
 
 class VIEWS_EXPORT DesktopDragDropClientWin
diff --git a/ui/views/widget/root_view.cc b/ui/views/widget/root_view.cc
index 51b6bdc..aec588d 100644
--- a/ui/views/widget/root_view.cc
+++ b/ui/views/widget/root_view.cc
@@ -9,6 +9,7 @@
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "ui/accessibility/ax_view_state.h"
+#include "ui/base/cursor/cursor.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/compositor/layer.h"
 #include "ui/events/event.h"
@@ -20,10 +21,6 @@
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 
-#if defined(USE_AURA)
-#include "ui/base/cursor/cursor.h"
-#endif
-
 namespace views {
 namespace internal {
 
diff --git a/ui/views/widget/widget.cc b/ui/views/widget/widget.cc
index 854fea3..68c339a 100644
--- a/ui/views/widget/widget.cc
+++ b/ui/views/widget/widget.cc
@@ -8,6 +8,7 @@
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
+#include "ui/base/cursor/cursor.h"
 #include "ui/base/default_theme_provider.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/l10n/l10n_font_util.h"
@@ -32,10 +33,6 @@
 #include "ui/views/window/custom_frame_view.h"
 #include "ui/views/window/dialog_delegate.h"
 
-#if defined(USE_AURA)
-#include "ui/base/cursor/cursor.h"
-#endif
-
 namespace views {
 
 namespace {
@@ -264,9 +261,7 @@ Widget* Widget::CreateWindowAsFramelessChild(WidgetDelegate* widget_delegate,
   params.child = true;
   params.parent = parent;
   params.remove_standard_frame = true;
-#if defined(USE_AURA)
   params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
-#endif
 
   widget->Init(params);
   return widget;
diff --git a/ui/views/widget/widget_hwnd_utils.cc b/ui/views/widget/widget_hwnd_utils.cc
index 3b6f69d..40ccd29 100644
--- a/ui/views/widget/widget_hwnd_utils.cc
+++ b/ui/views/widget/widget_hwnd_utils.cc
@@ -62,12 +62,8 @@ void CalculateWindowStylesFromInitParams(
   // 5- When the window is created but before it is presented, call
   //    DwmExtendFrameIntoClientArea passing -1 as the margins.
   if (params.opacity == Widget::InitParams::TRANSLUCENT_WINDOW) {
-#if defined(USE_AURA)
     if (ui::win::IsAeroGlassEnabled())
       *ex_style |= WS_EX_COMPOSITED;
-#else
-    *ex_style |= WS_EX_LAYERED;
-#endif
   }
   if (params.has_dropshadow) {
     *class_style |= (base::win::GetVersion() < base::win::VERSION_XP) ?
diff --git a/ui/views/widget/widget_interactive_uitest.cc b/ui/views/widget/widget_interactive_uitest.cc
index 8c8bbe2..cdae62f 100644
--- a/ui/views/widget/widget_interactive_uitest.cc
+++ b/ui/views/widget/widget_interactive_uitest.cc
@@ -5,20 +5,17 @@
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/run_loop.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
+#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) && !defined(OS_CHROMEOS)
+#if !defined(OS_CHROMEOS)
 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
 #endif
 
@@ -479,18 +476,14 @@ TEST_F(WidgetTest, WidgetNotActivatedOnFakeActivationMessages) {
   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());
@@ -509,7 +502,7 @@ TEST_F(WidgetTest, WidgetNotActivatedOnFakeActivationMessages) {
 }
 #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:
@@ -687,7 +680,7 @@ class WidgetCaptureTest : public ViewsTestBase {
  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
@@ -702,14 +695,14 @@ 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.
@@ -738,7 +731,7 @@ class MouseEventTrackingWidget : public Widget {
 
 }  // 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
diff --git a/ui/views/widget/widget_unittest.cc b/ui/views/widget/widget_unittest.cc
index 1b10418..4d33b2b 100644
--- a/ui/views/widget/widget_unittest.cc
+++ b/ui/views/widget/widget_unittest.cc
@@ -308,11 +308,11 @@ struct OwnershipTestState {
 
 // A platform NativeWidget subclass that updates a bag of state when it is
 // destroyed.
-class OwnershipTestNativeWidget : public NativeWidgetPlatform {
+class OwnershipTestNativeWidget : public NativeWidgetAura {
  public:
   OwnershipTestNativeWidget(internal::NativeWidgetDelegate* delegate,
                             OwnershipTestState* state)
-      : NativeWidgetPlatform(delegate),
+      : NativeWidgetAura(delegate),
         state_(state) {
   }
   virtual ~OwnershipTestNativeWidget() {
@@ -327,21 +327,21 @@ class OwnershipTestNativeWidget : public NativeWidgetPlatform {
 
 // A views NativeWidget subclass that updates a bag of state when it is
 // destroyed.
-class OwnershipTestNativeWidgetPlatform : public NativeWidgetPlatformForTest {
+class OwnershipTestNativeWidgetAura : public NativeWidgetCapture {
  public:
-  OwnershipTestNativeWidgetPlatform(internal::NativeWidgetDelegate* delegate,
-                                    OwnershipTestState* state)
-      : NativeWidgetPlatformForTest(delegate),
+  OwnershipTestNativeWidgetAura(internal::NativeWidgetDelegate* delegate,
+                                OwnershipTestState* state)
+      : NativeWidgetCapture(delegate),
         state_(state) {
   }
-  virtual ~OwnershipTestNativeWidgetPlatform() {
+  virtual ~OwnershipTestNativeWidgetAura() {
     state_->native_widget_deleted = true;
   }
 
  private:
   OwnershipTestState* state_;
 
-  DISALLOW_COPY_AND_ASSIGN(OwnershipTestNativeWidgetPlatform);
+  DISALLOW_COPY_AND_ASSIGN(OwnershipTestNativeWidgetAura);
 };
 
 // A Widget subclass that updates a bag of state when it is destroyed.
@@ -366,7 +366,7 @@ TEST_F(WidgetOwnershipTest, Ownership_WidgetOwnsPlatformNativeWidget) {
   scoped_ptr<Widget> widget(new OwnershipTestWidget(&state));
   Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_POPUP);
   params.native_widget =
-      new OwnershipTestNativeWidgetPlatform(widget.get(), &state);
+      new OwnershipTestNativeWidgetAura(widget.get(), &state);
   params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   widget->Init(params);
 
@@ -387,7 +387,7 @@ TEST_F(WidgetOwnershipTest, Ownership_WidgetOwnsViewsNativeWidget) {
   scoped_ptr<Widget> widget(new OwnershipTestWidget(&state));
   Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_POPUP);
   params.native_widget =
-      new OwnershipTestNativeWidgetPlatform(widget.get(), &state);
+      new OwnershipTestNativeWidgetAura(widget.get(), &state);
   params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   widget->Init(params);
 
@@ -412,7 +412,7 @@ TEST_F(WidgetOwnershipTest,
   scoped_ptr<Widget> widget(new OwnershipTestWidget(&state));
   Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_POPUP);
   params.native_widget =
-      new OwnershipTestNativeWidgetPlatform(widget.get(), &state);
+      new OwnershipTestNativeWidgetAura(widget.get(), &state);
   params.parent = toplevel->GetNativeView();
   params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   widget->Init(params);
@@ -442,7 +442,7 @@ TEST_F(WidgetOwnershipTest, Ownership_PlatformNativeWidgetOwnsWidget) {
   Widget* widget = new OwnershipTestWidget(&state);
   Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_POPUP);
   params.native_widget =
-      new OwnershipTestNativeWidgetPlatform(widget, &state);
+      new OwnershipTestNativeWidgetAura(widget, &state);
   widget->Init(params);
 
   // Now destroy the native widget.
@@ -461,7 +461,7 @@ TEST_F(WidgetOwnershipTest, Ownership_ViewsNativeWidgetOwnsWidget) {
   Widget* widget = new OwnershipTestWidget(&state);
   Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_POPUP);
   params.native_widget =
-      new OwnershipTestNativeWidgetPlatform(widget, &state);
+      new OwnershipTestNativeWidgetAura(widget, &state);
   params.parent = toplevel->GetNativeView();
   widget->Init(params);
 
@@ -485,15 +485,11 @@ TEST_F(WidgetOwnershipTest,
   Widget* widget = new OwnershipTestWidget(&state);
   Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_POPUP);
   params.native_widget =
-      new OwnershipTestNativeWidgetPlatform(widget, &state);
+      new OwnershipTestNativeWidgetAura(widget, &state);
   widget->Init(params);
 
   // Now simulate a destroy of the platform native widget from the OS:
-#if defined(USE_AURA)
   delete widget->GetNativeView();
-#elif defined(OS_WIN)
-  DestroyWindow(widget->GetNativeView());
-#endif
 
   EXPECT_TRUE(state.widget_deleted);
   EXPECT_TRUE(state.native_widget_deleted);
@@ -510,7 +506,7 @@ TEST_F(WidgetOwnershipTest,
   Widget* widget = new OwnershipTestWidget(&state);
   Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_POPUP);
   params.native_widget =
-      new OwnershipTestNativeWidgetPlatform(widget, &state);
+      new OwnershipTestNativeWidgetAura(widget, &state);
   params.parent = toplevel->GetNativeView();
   widget->Init(params);
 
@@ -536,7 +532,7 @@ TEST_F(WidgetOwnershipTest,
   Widget* widget = new OwnershipTestWidget(&state);
   Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_POPUP);
   params.native_widget =
-      new OwnershipTestNativeWidgetPlatform(widget, &state);
+      new OwnershipTestNativeWidgetAura(widget, &state);
   params.parent = toplevel->GetNativeView();
   widget->Init(params);
 
@@ -562,7 +558,7 @@ TEST_F(WidgetOwnershipTest,
   scoped_ptr<Widget> widget(new OwnershipTestWidget(&state));
   Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_POPUP);
   params.native_widget =
-      new OwnershipTestNativeWidgetPlatform(widget.get(), &state);
+      new OwnershipTestNativeWidgetAura(widget.get(), &state);
   params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   params.delegate = delegate_view;
   widget->Init(params);
@@ -647,7 +643,7 @@ TEST_F(WidgetWithDestroyedNativeViewTest, Test) {
     widget.native_widget_private()->CloseNow();
     InvokeWidgetMethods(&widget);
   }
-#if defined(USE_AURA) && !defined(OS_CHROMEOS)
+#if !defined(OS_CHROMEOS)
   {
     Widget widget;
     Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_POPUP);
@@ -831,7 +827,7 @@ TEST_F(WidgetObserverTest, WidgetBoundsChanged) {
   EXPECT_EQ(child2, widget_bounds_changed());
 }
 
-#if !defined(USE_AURA) && defined(OS_WIN)
+#if defined(false)
 // Aura needs shell to maximize/fullscreen window.
 // NativeWidgetGtk doesn't implement GetRestoredBounds.
 TEST_F(WidgetTest, GetRestoredBounds) {
@@ -900,7 +896,6 @@ TEST_F(WidgetTest, ExitFullscreenRestoreState) {
   RunPendingMessages();
 }
 
-#if defined(USE_AURA)
 // The key-event propagation from Widget happens differently on aura and
 // non-aura systems because of the difference in IME. So this test works only on
 // aura.
@@ -1389,8 +1384,6 @@ TEST_F(WidgetTest, WheelEventsFromScrollEventTarget) {
   widget->CloseNow();
 }
 
-#endif  // defined(USE_AURA)
-
 // Tests that if a scroll-begin gesture is not handled, then subsequent scroll
 // events are not dispatched to any view.
 TEST_F(WidgetTest, GestureScrollEventDispatching) {
@@ -1580,7 +1573,7 @@ TEST_F(WidgetTest, SingleWindowClosing) {
       CreateParams(Widget::InitParams::TYPE_WINDOW);
   init_params.bounds = gfx::Rect(0, 0, 200, 200);
   init_params.delegate = delegate.get();
-#if defined(USE_AURA) && !defined(OS_CHROMEOS)
+#if !defined(OS_CHROMEOS)
   init_params.native_widget = new DesktopNativeWidgetAura(widget);
 #endif
   widget->Init(init_params);
@@ -1597,7 +1590,7 @@ class WidgetWindowTitleTest : public WidgetTest {
         CreateParams(Widget::InitParams::TYPE_WINDOW);
     widget->Init(init_params);
 
-#if defined(USE_AURA) && !defined(OS_CHROMEOS)
+#if !defined(OS_CHROMEOS)
     if (desktop_native_widget)
       init_params.native_widget = new DesktopNativeWidgetAura(widget);
 #else
@@ -1638,13 +1631,13 @@ TEST_F(WidgetWindowTitleTest, SetWindowTitleChanged_NativeWidget) {
 }
 
 // DesktopNativeWidget does not exist on non-Aura or on ChromeOS.
-#if defined(USE_AURA) && !defined(OS_CHROMEOS)
+#if !defined(OS_CHROMEOS)
 TEST_F(WidgetWindowTitleTest, SetWindowTitleChanged_DesktopNativeWidget) {
   // Override to use a DesktopNativeWidget.
   bool desktop_native_widget = true;
   RunTest(desktop_native_widget);
 }
-#endif  // USE_AURA && !OS_CHROMEOS
+#endif  // !OS_CHROMEOS
 
 // Used by SetTopLevelCorrectly to track calls to OnBeforeWidgetInit().
 class VerifyTopLevelDelegate : public TestViewsDelegate {
@@ -1758,7 +1751,7 @@ bool RunGetNativeThemeFromDestructor(const Widget::InitParams& in_params,
   Widget::InitParams params(in_params);
   // Deletes itself when the Widget is destroyed.
   params.delegate = new GetNativeThemeFromDestructorView;
-#if defined(USE_AURA) && !defined(OS_CHROMEOS)
+#if !defined(OS_CHROMEOS)
   if (is_first_run) {
     params.native_widget = new DesktopNativeWidgetAura(widget);
     needs_second_run = true;
@@ -1807,7 +1800,7 @@ TEST_F(WidgetTest, CloseDestroys) {
   Widget::InitParams params =
       CreateParams(views::Widget::InitParams::TYPE_MENU);
   params.opacity = Widget::InitParams::OPAQUE_WINDOW;
-#if defined(USE_AURA) && !defined(OS_CHROMEOS)
+#if !defined(OS_CHROMEOS)
   params.native_widget = new DesktopNativeWidgetAura(widget);
 #endif
   widget->Init(params);
@@ -1965,7 +1958,7 @@ class WidgetChildDestructionTest : public WidgetTest {
     Widget* top_level = new Widget;
     Widget::InitParams params =
         CreateParams(views::Widget::InitParams::TYPE_WINDOW);
-#if defined(USE_AURA) && !defined(OS_CHROMEOS)
+#if !defined(OS_CHROMEOS)
     if (top_level_has_desktop_native_widget_aura)
       params.native_widget = new DesktopNativeWidgetAura(top_level);
 #endif
@@ -1978,7 +1971,7 @@ class WidgetChildDestructionTest : public WidgetTest {
     Widget::InitParams child_params =
         CreateParams(views::Widget::InitParams::TYPE_POPUP);
     child_params.parent = top_level->GetNativeView();
-#if defined(USE_AURA) && !defined(OS_CHROMEOS)
+#if !defined(OS_CHROMEOS)
     if (child_has_desktop_native_widget_aura)
       child_params.native_widget = new DesktopNativeWidgetAura(child);
 #endif
@@ -2000,7 +1993,7 @@ class WidgetChildDestructionTest : public WidgetTest {
   DISALLOW_COPY_AND_ASSIGN(WidgetChildDestructionTest);
 };
 
-#if defined(USE_AURA) && !defined(OS_CHROMEOS)
+#if !defined(OS_CHROMEOS)
 // See description of RunDestroyChildWidgetsTest(). Parent uses
 // DesktopNativeWidgetAura.
 TEST_F(WidgetChildDestructionTest,
@@ -2021,7 +2014,7 @@ TEST_F(WidgetChildDestructionTest, DestroyChildWidgetsInOrder) {
   RunDestroyChildWidgetsTest(false, false);
 }
 
-#if defined(USE_AURA) && !defined(OS_CHROMEOS)
+#if !defined(OS_CHROMEOS)
 // Provides functionality to create a window modal dialog.
 class ModalDialogDelegate : public DialogDelegateView {
  public:
@@ -2114,7 +2107,6 @@ TEST_F(WidgetTest, WindowMouseModalityTest) {
   top_level_widget.CloseNow();
 }
 
-#if defined(USE_AURA)
 // Verifies nativeview visbility matches that of Widget visibility when
 // SetFullscreen is invoked.
 TEST_F(WidgetTest, FullscreenStatePropagated) {
@@ -2145,7 +2137,6 @@ TEST_F(WidgetTest, FullscreenStatePropagated) {
   }
 #endif
 }
-#endif
 
 #if defined(OS_WIN)
 
@@ -2279,7 +2270,7 @@ TEST_F(WidgetTest, ShowAfterShowInactive) {
   widget->CloseNow();
 }
 
-#if defined(USE_AURA) && !defined(OS_CHROMEOS)
+#if !defined(OS_CHROMEOS)
 TEST_F(WidgetTest, InactiveWidgetDoesNotGrabActivation) {
   Widget* widget = CreateTopLevelPlatformWidget();
   widget->Show();
diff --git a/ui/views/window/custom_frame_view.cc b/ui/views/window/custom_frame_view.cc
index c825ee6..1dbd9fb 100644
--- a/ui/views/window/custom_frame_view.cc
+++ b/ui/views/window/custom_frame_view.cc
@@ -19,6 +19,7 @@
 #include "ui/views/color_constants.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/views_delegate.h"
+#include "ui/views/widget/native_widget_aura.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 #include "ui/views/window/client_view.h"
@@ -26,10 +27,6 @@
 #include "ui/views/window/window_resources.h"
 #include "ui/views/window/window_shape.h"
 
-#if defined(USE_AURA)
-#include "ui/views/widget/native_widget_aura.h"
-#endif
-
 namespace views {
 
 namespace {
@@ -66,12 +63,7 @@ const SkColor kDefaultColorFrameInactive = SkColorSetRGB(161, 182, 228);
 
 const gfx::FontList& GetTitleFontList() {
   static const gfx::FontList title_font_list =
-#if defined(USE_AURA)
       NativeWidgetAura::GetWindowTitleFontList();
-#elif defined(OS_LINUX)
-    // TODO(ben): need to resolve what font this is.
-      gfx::FontList();
-#endif
   return title_font_list;
 }