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

trunk/src/chrome/browser/ui/views/toolbar/wrench_menu.cc

Index: trunk/src/chrome/browser/ui/views/toolbar/wrench_menu.cc
===================================================================
--- trunk/src/chrome/browser/ui/views/toolbar/wrench_menu.cc	(revision 285300)
+++ trunk/src/chrome/browser/ui/views/toolbar/wrench_menu.cc	(working copy)
@@ -572,7 +572,7 @@
         copy_index);
     InMenuButton* paste = CreateAndConfigureButton(
         IDS_PASTE,
-        menu->use_new_menu() && menu->supports_new_separators() ?
+        menu->use_new_menu() && menu->supports_new_separators_ ?
             InMenuButtonBackground::CENTER_BUTTON :
             InMenuButtonBackground::RIGHT_BUTTON,
         paste_index);
@@ -654,7 +654,7 @@
     zoom_label_->SetHorizontalAlignment(gfx::ALIGN_RIGHT);
 
     InMenuButtonBackground* center_bg = new InMenuButtonBackground(
-        menu->use_new_menu() && menu->supports_new_separators() ?
+        menu->use_new_menu() && menu->supports_new_separators_ ?
             InMenuButtonBackground::RIGHT_BUTTON :
             InMenuButtonBackground::CENTER_BUTTON,
         menu->use_new_menu());
@@ -946,14 +946,17 @@
 
 // WrenchMenu ------------------------------------------------------------------
 
-WrenchMenu::WrenchMenu(Browser* browser, int run_flags)
+WrenchMenu::WrenchMenu(Browser* browser,
+                       bool use_new_menu,
+                       bool supports_new_separators)
     : root_(NULL),
       browser_(browser),
       selected_menu_model_(NULL),
       selected_index_(0),
       bookmark_menu_(NULL),
       feedback_menu_item_(NULL),
-      run_flags_(run_flags) {
+      use_new_menu_(use_new_menu),
+      supports_new_separators_(supports_new_separators) {
   registrar_.Add(this, chrome::NOTIFICATION_GLOBAL_ERRORS_CHANGED,
                  content::Source<Profile>(browser_->profile()));
 }
@@ -982,14 +985,8 @@
     DCHECK(command_id_to_entry_.find(i) == command_id_to_entry_.end());
 #endif  // defined(DEBUG)
 
-  int32 types = views::MenuRunner::HAS_MNEMONICS;
-  if (for_drop()) {
-    // We add NESTED_DRAG since currently the only operation to open the wrench
-    // menu for is an extension action drag, which is controlled by the child
-    // BrowserActionsContainer view.
-    types |= views::MenuRunner::FOR_DROP | views::MenuRunner::NESTED_DRAG;
-  }
-  menu_runner_.reset(new views::MenuRunner(root_, types));
+  menu_runner_.reset(
+      new views::MenuRunner(root_, views::MenuRunner::HAS_MNEMONICS));
 }
 
 void WrenchMenu::RunMenu(views::MenuButton* host) {
@@ -1014,11 +1011,6 @@
     selected_menu_model_->ActivatedAt(selected_index_);
 }
 
-void WrenchMenu::CloseMenu() {
-  if (menu_runner_.get())
-    menu_runner_->Cancel();
-}
-
 bool WrenchMenu::IsShowing() {
   return menu_runner_.get() && menu_runner_->IsRunning();
 }
@@ -1260,15 +1252,14 @@
     // The button container menu items have a special height which we have to
     // use instead of the normal height.
     int height = 0;
-    if (use_new_menu() &&
+    if (use_new_menu_ &&
         (model->GetCommandIdAt(i) == IDC_CUT ||
          model->GetCommandIdAt(i) == IDC_ZOOM_MINUS))
       height = kMenuItemContainingButtonsHeight;
 
     scoped_ptr<ExtensionToolbarMenuView> extension_toolbar_menu_view;
     if (model->GetCommandIdAt(i) == IDC_EXTENSIONS_OVERFLOW_MENU) {
-      extension_toolbar_menu_view.reset(
-          new ExtensionToolbarMenuView(browser_, this));
+      extension_toolbar_menu_view.reset(new ExtensionToolbarMenuView(browser_));
       height = extension_toolbar_menu_view->GetPreferredSize().height();
     }
 
@@ -1372,7 +1363,7 @@
 
   if (menu_item) {
     // Flush all buttons to the right side of the menu for the new menu type.
-    menu_item->set_use_right_margin(!use_new_menu());
+    menu_item->set_use_right_margin(!use_new_menu_);
     menu_item->SetVisible(model->IsVisibleAt(model_index));
 
     if (menu_type == MenuModel::TYPE_COMMAND && model->HasIcons()) {