Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(967)

Unified Diff: ui/views/controls/menu/menu_host.cc

Issue 290553002: Refactor menu dependency on aura/wm SetShadowType (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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);
native_widget_private()->SetCapture();
}
}

Powered by Google App Engine
This is Rietveld 408576698