Nukes USE_AURA ifdefs from views

ui/views/controls/menu/menu_host.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 "ui/views/controls/menu/menu_host.h"
 
 #include "base/auto_reset.h"
 #include "base/debug/trace_event.h"
 #include "ui/events/gestures/gesture_recognizer.h"
 #include "ui/gfx/path.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/views/controls/menu/menu_controller.h"
 #include "ui/views/controls/menu/menu_host_root_view.h"
 #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 {
 
 ////////////////////////////////////////////////////////////////////////////////
 // MenuHost, public:
 
 MenuHost::MenuHost(SubmenuView* submenu)
     : submenu_(submenu),
       destroying_(false),
       ignore_capture_lost_(false) {
   set_auto_release_capture(false);
@@ skipping 15 matching lines @@
   bool bubble_border = submenu_->GetScrollViewContainer() &&
                        submenu_->GetScrollViewContainer()->HasBubbleBorder();
   params.has_dropshadow = !bubble_border;
   params.opacity = (bubble_border || rounded_border) ?
       Widget::InitParams::TRANSLUCENT_WINDOW :
       Widget::InitParams::OPAQUE_WINDOW;
   params.parent = parent ? parent->GetNativeView() : NULL;
   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)
     SetOpacity(0);
   ShowMenuHost(do_capture);
 }
 
 bool MenuHost::IsMenuHostVisible() {
   return IsVisible();
 }
 
 void MenuHost::ShowMenuHost(bool do_capture) {
   // Doing a capture may make us get capture lost. Ignore it while we're in the
   // process of showing.
   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();
   }
 }
 
 void MenuHost::HideMenuHost() {
   ignore_capture_lost_ = true;
   ReleaseMenuHostCapture();
   Hide();
   ignore_capture_lost_ = false;
 }
@@ skipping 45 matching lines @@
   if (destroying_)
     return;
 
   MenuController* menu_controller =
       submenu_->GetMenuItem()->GetMenuController();
   if (menu_controller && !menu_controller->drag_in_progress())
     menu_controller->CancelAll();
 }
 
 }  // namespace views