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

chrome/browser/ui/views/toolbar/toolbar_action_view_unittest.cc

 // Copyright 2015 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 "base/run_loop.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/sessions/session_tab_helper.h"
 #include "chrome/browser/ui/toolbar/test_toolbar_action_view_controller.h"
 #include "chrome/browser/ui/toolbar/toolbar_action_view_controller.h"
@@ skipping 46 matching lines @@
  private:
   bool shown_in_menu_;
 
   views::MenuButton* overflow_reference_view_;
 
   content::WebContents* web_contents_;
 
   DISALLOW_COPY_AND_ASSIGN(TestToolbarActionViewDelegate);
 };
 
+class OpenMenuListener : public views::ContextMenuController {
+ public:
+  explicit OpenMenuListener(views::View* view)
+      : view_(view),
+        opened_menu_(false) {
+    view_->set_context_menu_controller(this);
+  }
+  ~OpenMenuListener() override {
+    view_->set_context_menu_controller(nullptr);
+  }
+
+  void ShowContextMenuForView(views::View* source,
+                              const gfx::Point& point,
+                              ui::MenuSourceType source_type) override {
+    opened_menu_ = true;
+  };
+
+  bool opened_menu() const { return opened_menu_; }
+
+ private:
+  views::View* view_;
+
+  bool opened_menu_;
+
+  DISALLOW_COPY_AND_ASSIGN(OpenMenuListener);
+};
+
 }  // namespace
 
 class ToolbarActionViewUnitTest : public views::ViewsTestBase {
  public:
   ToolbarActionViewUnitTest()
       : widget_(nullptr),
         ui_thread_(content::BrowserThread::UI, message_loop()) {}
   ~ToolbarActionViewUnitTest() override {}
 
   void SetUp() override {
@@ skipping 85 matching lines @@
   EXPECT_EQ(views::Button::STATE_PRESSED, view.state());
   controller.HidePopup();
   EXPECT_EQ(views::Button::STATE_NORMAL, view.state());
 
   // Ensure that the button's enabled state reflects that of the controller.
   controller.SetEnabled(false);
   EXPECT_EQ(views::Button::STATE_DISABLED, view.state());
   controller.SetEnabled(true);
   EXPECT_EQ(views::Button::STATE_NORMAL, view.state());
 
+  // Ensure that clicking on an otherwise-disabled action optionally opens the
+  // context menu.
+  controller.SetDisabledClickOpensMenu(true);
+  controller.SetEnabled(false);
+  EXPECT_EQ(views::Button::STATE_NORMAL, view.state());
+  int old_execute_action_count = controller.execute_action_count();
+  {
+    OpenMenuListener menu_listener(&view);
+    view.Activate();
+    EXPECT_TRUE(menu_listener.opened_menu());
+    EXPECT_EQ(old_execute_action_count, controller.execute_action_count());
+  }
+
   // Ensure that the button's want-to-run state reflects that of the controller.
   controller.SetWantsToRun(true);
   EXPECT_TRUE(view.wants_to_run_for_testing());
   controller.SetWantsToRun(false);
   EXPECT_FALSE(view.wants_to_run_for_testing());
 
   // Create an overflow button.
   views::MenuButton overflow_button(nullptr, base::string16(), nullptr, false);
   overflow_button.set_owned_by_client();
   action_view_delegate.set_overflow_reference_view(&overflow_button);
 
   // If the view isn't visible, the overflow button should be pressed for
   // popups.
   view.SetVisible(false);
   controller.ShowPopup(true);
   EXPECT_EQ(views::Button::STATE_NORMAL, view.state());
   EXPECT_EQ(views::Button::STATE_PRESSED, overflow_button.state());
   controller.HidePopup();
   EXPECT_EQ(views::Button::STATE_NORMAL, view.state());
   EXPECT_EQ(views::Button::STATE_NORMAL, overflow_button.state());
 }