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

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

Issue 12529012: Context menu on views must show on mouse down for non-WIN. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: patch Created 7 years, 8 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 6d2e5fb0a13d2f6dd1b326c00099634c492d1b69..badd97b5216cc0a6ec832456de92095dbbcbcb0d 100644
--- a/ui/views/controls/menu/menu_controller.h
+++ b/ui/views/controls/menu/menu_controller.h
@@ -136,6 +136,9 @@ class VIEWS_EXPORT MenuController : public MessageLoop::Dispatcher,
// WidgetObserver overrides:
virtual void OnWidgetDestroying(Widget* widget) OVERRIDE;
+ // Only used for testing.
+ static void TurnOffContextMenuSelectionHoldForTest();
+
private:
friend class internal::MenuRunnerImpl;
friend class MenuHostRootView;
@@ -567,6 +570,9 @@ class VIEWS_EXPORT MenuController : public MessageLoop::Dispatcher,
// The timestamp of the event which closed the menu - or 0 otherwise.
base::TimeDelta closing_event_time_;
+ // Time when the menu is first shown.
+ base::TimeTicks menu_start_time_;
+
DISALLOW_COPY_AND_ASSIGN(MenuController);
};

Powered by Google App Engine
This is Rietveld 408576698