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 5e8593b98ab06b57bc2e780541d1fe18b8f904b4..791438d4785189cd7ef595712af61efd0173371c 100644 |
--- a/ui/views/controls/menu/menu_host.cc |
+++ b/ui/views/controls/menu/menu_host.cc |
@@ -17,7 +17,6 @@ |
#include "ui/views/round_rect_painter.h" |
#include "ui/views/widget/native_widget_private.h" |
#include "ui/views/widget/widget.h" |
-#include "ui/wm/core/shadow_types.h" |
namespace views { |
@@ -54,9 +53,6 @@ void MenuHost::InitMenuHost(Widget* parent, |
params.bounds = bounds; |
Init(params); |
- if (bubble_border) |
- SetShadowType(GetNativeView(), wm::SHADOW_TYPE_NONE); |
Andre
2014/05/04 20:05:30
Moved this to InitNativeWidget().
|
- |
SetContentsView(contents_view); |
if (bubble_border || rounded_border) |
SetOpacity(0); |
@@ -75,7 +71,7 @@ void MenuHost::ShowMenuHost(bool do_capture) { |
if (do_capture) { |
// 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); |
+ ui::GestureRecognizer::Get()->TransferEventsTo(NULL, NULL); |
Andre
2014/05/04 20:05:30
The first argument is unused when the second argum
|
native_widget_private()->SetCapture(); |
} |
} |