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

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

 // Copyright 2013 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 "chrome/browser/ui/views/toolbar/toolbar_view.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
@@ skipping 323 matching lines @@
     location_bar_->GetPageActionView(extension_action)->image_view()->
         ExecuteAction(ExtensionPopup::SHOW);
   }
 }
 
 void ToolbarView::ShowBrowserActionPopup(
     const extensions::Extension* extension) {
   browser_actions_->ShowPopup(extension, true);
 }
 
-void ToolbarView::ShowAppMenu(bool for_drop) {
-  if (wrench_menu_.get() && wrench_menu_->IsShowing())
-    return;
-
-  int run_flags = 0;
-  bool use_new_menu = false;
-  // TODO: remove this.
-#if !defined(OS_LINUX) || defined(OS_CHROMEOS)
-  if (GetNativeTheme() == ui::NativeThemeAura::instance()) {
-    use_new_menu = true;
-    run_flags |= WrenchMenu::SUPPORTS_NEW_SEPARATORS | WrenchMenu::USE_NEW_MENU;
-  }
-#endif
-
-  if (keyboard::KeyboardController::GetInstance() &&
-      keyboard::KeyboardController::GetInstance()->keyboard_visible()) {
-    keyboard::KeyboardController::GetInstance()->HideKeyboard(
-        keyboard::KeyboardController::HIDE_REASON_AUTOMATIC);
-  }
-
-  if (for_drop)
-    run_flags |= WrenchMenu::FOR_DROP;
-  wrench_menu_.reset(new WrenchMenu(browser_, run_flags));
-  wrench_menu_model_.reset(new WrenchMenuModel(this, browser_, use_new_menu));
-  wrench_menu_->Init(wrench_menu_model_.get());
-
-  FOR_EACH_OBSERVER(views::MenuListener, menu_listeners_, OnMenuOpened());
-
-  wrench_menu_->RunMenu(app_menu_);
-}
-
 views::MenuButton* ToolbarView::app_menu() const {
   return app_menu_;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ToolbarView, AccessiblePaneView overrides:
 
 bool ToolbarView::SetPaneFocus(views::View* initial_focus) {
   if (!AccessiblePaneView::SetPaneFocus(initial_focus))
     return false;
@@ skipping 14 matching lines @@
   return GetWidget()->GetAccelerator(id, accel);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ToolbarView, views::MenuButtonListener implementation:
 
 void ToolbarView::OnMenuButtonClicked(views::View* source,
                                       const gfx::Point& point) {
   TRACE_EVENT0("views", "ToolbarView::OnMenuButtonClicked");
   DCHECK_EQ(VIEW_ID_APP_MENU, source->id());
-  ShowAppMenu(false);  // Not for drop.
+
+  bool use_new_menu = false;
+  bool supports_new_separators = false;
+  // TODO: remove this.
+#if !defined(OS_LINUX) || defined(OS_CHROMEOS)
+  supports_new_separators =
+      GetNativeTheme() == ui::NativeThemeAura::instance();
+  use_new_menu = supports_new_separators;
+#endif
+
+  if (keyboard::KeyboardController::GetInstance() &&
+      keyboard::KeyboardController::GetInstance()->keyboard_visible()) {
+    keyboard::KeyboardController::GetInstance()->HideKeyboard(
+        keyboard::KeyboardController::HIDE_REASON_AUTOMATIC);
+  }
+
+  wrench_menu_.reset(new WrenchMenu(browser_, use_new_menu,
+                                    supports_new_separators));
+  wrench_menu_model_.reset(new WrenchMenuModel(this, browser_, use_new_menu));
+  wrench_menu_->Init(wrench_menu_model_.get());
+
+  FOR_EACH_OBSERVER(views::MenuListener, menu_listeners_, OnMenuOpened());
+
+  wrench_menu_->RunMenu(app_menu_);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ToolbarView, LocationBarView::Delegate implementation:
 
 WebContents* ToolbarView::GetWebContents() {
   return browser_->tab_strip_model()->GetActiveWebContents();
 }
 
 ToolbarModel* ToolbarView::GetToolbarModel() {
@@ skipping 380 matching lines @@
 
 void ToolbarView::OnShowHomeButtonChanged() {
   Layout();
   SchedulePaint();
 }
 
 int ToolbarView::content_shadow_height() const {
   return browser_->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH ?
       kContentShadowHeightAsh : kContentShadowHeight;
 }