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

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

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/controls/menu/menu_runner_impl.h"
 
 #include "ui/native_theme/native_theme.h"
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/menu/menu_controller.h"
 #include "ui/views/controls/menu/menu_delegate.h"
@@ skipping 87 matching lines @@
         return MenuRunner::NORMAL_EXIT;
       }
       // Drop menus don't block the message loop, so it's ok to create a new
       // MenuController.
       controller = NULL;
     }
   }
 
   running_ = true;
   for_drop_ = (run_types & MenuRunner::FOR_DROP) != 0;
-  bool has_mnemonics = (run_types & MenuRunner::HAS_MNEMONICS) != 0;
+  bool has_mnemonics =
+      (run_types & MenuRunner::HAS_MNEMONICS) != 0 && !for_drop_;
   owns_controller_ = false;
   if (!controller) {
     // No menus are showing, show one.
     ui::NativeTheme* theme =
         parent ? parent->GetNativeTheme() : ui::NativeTheme::instance();
     controller = new MenuController(theme, !for_drop_, this);
     owns_controller_ = true;
   }
   controller->set_is_combobox((run_types & MenuRunner::COMBOBOX) != 0);
   controller_ = controller;
   menu_->set_controller(controller_);
   menu_->PrepareForRun(owns_controller_,
                        has_mnemonics,
                        !for_drop_ && ShouldShowMnemonics(button));
 
   // Run the loop.
   int mouse_event_flags = 0;
   MenuItemView* result =
       controller->Run(parent,
                       button,
                       menu_,
                       bounds,
                       anchor,
                       (run_types & MenuRunner::CONTEXT_MENU) != 0,
-                      (run_types & MenuRunner::NESTED_DRAG) != 0,
                       &mouse_event_flags);
   // Get the time of the event which closed this menu.
   closing_event_time_ = controller->closing_event_time();
   if (for_drop_) {
     // Drop menus return immediately. We finish processing in DropMenuClosed.
     return MenuRunner::NORMAL_EXIT;
   }
   return MenuDone(result, mouse_event_flags);
 }
 
@@ skipping 64 matching lines @@
 #if defined(OS_WIN)
   // This is only needed on Windows.
   if (!show_mnemonics)
     show_mnemonics = base::win::IsAltPressed();
 #endif
   return show_mnemonics;
 }
 
 }  // namespace internal
 }  // namespace views