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

Unified Diff: ui/views/controls/menu/menu_controller.h

Issue 547303003: Keep reference view pressed while extension actions have a popup (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: MenuButton::PressedLock Created 6 years, 3 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_controller.h
diff --git a/ui/views/controls/menu/menu_controller.h b/ui/views/controls/menu/menu_controller.h
index dd1485dc858cc58d30242ec507a70bf6c5fae735..16348f34691eebf895de1fda646a7027fb6d3df3 100644
--- a/ui/views/controls/menu/menu_controller.h
+++ b/ui/views/controls/menu/menu_controller.h
@@ -17,6 +17,7 @@
#include "ui/events/event.h"
#include "ui/events/event_constants.h"
#include "ui/events/platform/platform_event_dispatcher.h"
+#include "ui/views/controls/button/menu_button.h"
#include "ui/views/controls/menu/menu_config.h"
#include "ui/views/controls/menu/menu_delegate.h"
#include "ui/views/widget/widget_observer.h"
@@ -598,6 +599,10 @@ class VIEWS_EXPORT MenuController : public WidgetObserver {
MenuButton* menu_button_;
sky 2014/09/19 21:21:59 Is this needed anymore?
Devlin 2014/09/19 22:37:49 Actually, no. Nifty.
+ // Locks to keep the menu button pressed while a menu is visible.
+ scoped_ptr<MenuButton::PressedLock> pressed_lock_;
+ scoped_ptr<MenuButton::PressedLock> nested_pressed_lock_;
+
// ViewStorage id used to store the view mouse drag events are forwarded to.
// See UpdateActiveMouseView() for details.
const int active_mouse_view_id_;

Powered by Google App Engine
This is Rietveld 408576698