[Extension Toolbar Redesign] Wants to act treatment, redux - left click

chrome/browser/ui/views/toolbar/toolbar_action_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_action_view.h"
 
 #include <string>
 
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 119 matching lines @@
     wants_to_run_border_->Paint(*this, canvas);
 }
 
 void ToolbarActionView::GetAccessibleState(ui::AXViewState* state) {
   views::MenuButton::GetAccessibleState(state);
   state->role = ui::AX_ROLE_BUTTON;
 }
 
 void ToolbarActionView::ButtonPressed(views::Button* sender,
                                       const ui::Event& event) {
-  view_controller_->ExecuteAction(true);
+  gfx::Point menu_point;
+  ui::MenuSourceType type = ui::MENU_SOURCE_NONE;
+  if (event.IsMouseEvent()) {
+    menu_point = static_cast<const ui::MouseEvent&>(event).location();
+    type = ui::MENU_SOURCE_MOUSE;
+  } else if (event.IsKeyEvent()) {
+    menu_point = GetKeyboardContextMenuLocation();
+    type = ui::MENU_SOURCE_KEYBOARD;
+  } else if (event.IsGestureEvent()) {
+    menu_point = static_cast<const ui::GestureEvent&>(event).location();
+    type = ui::MENU_SOURCE_TOUCH;
+  }
+
+  HandleActivation(menu_point, type);
 }
 
 void ToolbarActionView::UpdateState() {
   content::WebContents* web_contents = GetCurrentWebContents();
   if (SessionTabHelper::IdForTab(web_contents) < 0)
     return;
 
-  if (!view_controller_->IsEnabled(web_contents))
-    SetState(views::CustomButton::STATE_DISABLED);
-  else if (state() == views::CustomButton::STATE_DISABLED)
+  if (!view_controller_->IsEnabled(web_contents) &&
+      !view_controller_->DisabledClickOpensMenu()) {
+      SetState(views::CustomButton::STATE_DISABLED);
+  } else if (state() == views::CustomButton::STATE_DISABLED) {
     SetState(views::CustomButton::STATE_NORMAL);
+  }
 
   wants_to_run_ = view_controller_->WantsToRun(web_contents);
 
   gfx::ImageSkia icon(
       view_controller_->GetIcon(web_contents,
                                 GetPreferredSize()).AsImageSkia());
 
   if (!icon.isNull()) {
     ThemeService* theme = ThemeServiceFactory::GetForProfile(profile_);
 
@@ skipping 13 matching lines @@
                                 const content::NotificationSource& source,
                                 const content::NotificationDetails& details) {
   DCHECK_EQ(chrome::NOTIFICATION_BROWSER_THEME_CHANGED, type);
   UpdateState();
 }
 
 bool ToolbarActionView::Activate() {
   if (!view_controller_->HasPopup(GetCurrentWebContents()))
     return true;
 
-  view_controller_->ExecuteAction(true);
+  // Unfortunately, we don't get any of the event points for this call. Since
+  // these are only used for showing a context menu when an action is disabled,
+  // it's not that big a deal. Fake it.
+  // TODO(devlin): This could obviously be improved.
+  HandleActivation(GetKeyboardContextMenuLocation(), ui::MENU_SOURCE_KEYBOARD);
 
   // TODO(erikkay): Run a nested modal loop while the mouse is down to
   // enable menu-like drag-select behavior.
 
   // The return value of this method is returned via OnMousePressed.
   // We need to return false here since we're handing off focus to another
   // widget/view, and true will grab it right back and try to send events
   // to us.
   return false;
 }
@@ skipping 178 matching lines @@
     if (menu_controller->in_nested_run()) {
       // There is another menu showing. Close the outermost menu (since we are
       // shown in the same menu, we don't want to close the whole thing).
       menu_controller->Cancel(views::MenuController::EXIT_OUTERMOST);
       return true;
     }
   }
 
   return false;
 }
+
+void ToolbarActionView::HandleActivation(const gfx::Point& menu_point,
+                                         ui::MenuSourceType source_type) {
+  if (!view_controller_->IsEnabled(GetCurrentWebContents())) {
+    // We should only get a button pressed event with a non-enabled action if
+    // the left-click behavior should open the menu.
+    DCHECK(view_controller_->DisabledClickOpensMenu());
+    context_menu_controller()->ShowContextMenuForView(
+        this, menu_point, source_type);
+  } else {
+    view_controller_->ExecuteAction(true);
+  }
+}