Revert 285142 "Open the WrenchMenu on mouseover when dragging a ..."

trunk/src/ui/views/controls/menu/menu_controller.cc

Index: trunk/src/ui/views/controls/menu/menu_controller.cc
===================================================================
--- trunk/src/ui/views/controls/menu/menu_controller.cc	(revision 285300)
+++ trunk/src/ui/views/controls/menu/menu_controller.cc	(working copy)
@@ -290,7 +290,6 @@
                                   const gfx::Rect& bounds,
                                   MenuAnchorPosition position,
                                   bool context_menu,
-                                  bool is_nested_drag,
                                   int* result_event_flags) {
   exit_type_ = EXIT_NONE;
   possible_drag_ = false;
@@ -349,11 +348,9 @@
   SetSelection(root, SELECTION_OPEN_SUBMENU | SELECTION_UPDATE_IMMEDIATELY);
 
   if (!blocking_run_) {
-    if (!is_nested_drag) {
-      // Start the timer to hide the menu. This is needed as we get no
-      // notification when the drag has finished.
-      StartCancelAllTimer();
-    }
+    // Start the timer to hide the menu. This is needed as we get no
+    // notification when the drag has finished.
+    StartCancelAllTimer();
     return NULL;
   }
 
@@ -818,10 +815,6 @@
   message_loop_->ClearOwner();
 }
 
-bool MenuController::IsCancelAllTimerRunningForTest() {
-  return cancel_all_timer_.IsRunning();
-}
-
 // static
 void MenuController::TurnOffMenuSelectionHoldForTest() {
   menu_selection_hold_time_ms = -1;