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

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

Issue 2876203003: Make shelf item can be dragged when context menu is opened.
Patch Set: Created 3 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/submenu_view.cc
diff --git a/ui/views/controls/menu/submenu_view.cc b/ui/views/controls/menu/submenu_view.cc
index 5f3b54c787cc7cb8ffa33910199d584172e4aa5e..22012841030bb163ec382bcca70fca03f9d18e41 100644
--- a/ui/views/controls/menu/submenu_view.cc
+++ b/ui/views/controls/menu/submenu_view.cc
@@ -367,9 +367,10 @@ bool SubmenuView::IsShowing() {
void SubmenuView::ShowAt(Widget* parent,
const gfx::Rect& bounds,
- bool do_capture) {
+ bool do_capture,
+ bool cancel_active_touches) {
xiyuan 2017/05/12 20:24:57 ditto, get |cancel_active_touches| from MenuContro
if (host_) {
- host_->ShowMenuHost(do_capture);
+ host_->ShowMenuHost(do_capture, cancel_active_touches);
} else {
host_ = new MenuHost(this);
// Force construction of the scroll view container.
@@ -377,7 +378,8 @@ void SubmenuView::ShowAt(Widget* parent,
// Force a layout since our preferred size may not have changed but our
// content may have.
InvalidateLayout();
- host_->InitMenuHost(parent, bounds, scroll_view_container_, do_capture);
+ host_->InitMenuHost(parent, bounds, scroll_view_container_, do_capture,
+ cancel_active_touches);
}
GetScrollViewContainer()->NotifyAccessibilityEvent(
« ui/views/controls/menu/menu_runner_impl.cc ('K') | « ui/views/controls/menu/submenu_view.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698