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 1a4c195a74b200bdc90e1c8e97c9603d86154eac..b81d890f72df76485eddb2a5096424c93d41980c 100644 |
--- a/ui/views/controls/menu/menu_controller.h |
+++ b/ui/views/controls/menu/menu_controller.h |
@@ -84,6 +84,7 @@ class VIEWS_EXPORT MenuController : public WidgetObserver { |
const gfx::Rect& bounds, |
MenuAnchorPosition position, |
bool context_menu, |
+ bool is_nested_drag, |
int* event_flags); |
// Whether or not Run blocks. |
@@ -162,6 +163,9 @@ class VIEWS_EXPORT MenuController : public WidgetObserver { |
virtual void OnWidgetDestroying(Widget* widget) OVERRIDE; |
// Only used for testing. |
+ bool IsCancelAllTimerRunningForTest(); |
+ |
+ // Only used for testing. |
static void TurnOffMenuSelectionHoldForTest(); |
private: |