Chromium Code Reviews| 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..86102e72926ccd2d50c7234c00696695feb76ae2 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 { |
| @@ -55,7 +54,7 @@ void MenuHost::InitMenuHost(Widget* parent, |
| Init(params); |
| if (bubble_border) |
| - SetShadowType(GetNativeView(), wm::SHADOW_TYPE_NONE); |
| + SetHasActivationShadow(false); |
| SetContentsView(contents_view); |
| if (bubble_border || rounded_border) |
| @@ -75,7 +74,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); |
|
sadrul
2014/05/15 16:53:09
This looks suspicious. Can you explain this change
Andre
2014/05/15 18:45:59
Ah yes, there was an attached comment on an earlie
|
| native_widget_private()->SetCapture(); |
| } |
| } |