| Index: ui/views/controls/menu/menu_host.cc
|
| diff --git a/ui/views/controls/menu/menu_host.cc b/ui/views/controls/menu/menu_host.cc
|
| index 61e3f3818532138c8bec5d9d532f22044f8bec8a..650b36e5d7a3b5bf1981eaa70c2ac89f9ec2e53c 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();
|
| }
|
| }
|
|
|