Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4253)

Unified Diff: chrome/browser/ui/toolbar/test_toolbar_action_view_controller.h

Issue 1216053013: [Extension Toolbar Redesign] Wants to act treatment, redux - left click (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/toolbar/test_toolbar_action_view_controller.h
diff --git a/chrome/browser/ui/toolbar/test_toolbar_action_view_controller.h b/chrome/browser/ui/toolbar/test_toolbar_action_view_controller.h
index c3170770b4e67f49f1c0450c515603ad3f6320d5..8f43e3423e791d37e4ab0291d968343f4fd2416b 100644
--- a/chrome/browser/ui/toolbar/test_toolbar_action_view_controller.h
+++ b/chrome/browser/ui/toolbar/test_toolbar_action_view_controller.h
@@ -33,6 +33,7 @@ class TestToolbarActionViewController : public ToolbarActionViewController {
bool CanDrag() const override;
bool ExecuteAction(bool by_user) override;
void UpdateState() override;
+ bool DisabledClickOpensMenu() const override;
// Instruct the controller to fake showing a popup.
void ShowPopup(bool by_user);
@@ -42,6 +43,7 @@ class TestToolbarActionViewController : public ToolbarActionViewController {
void SetTooltip(const base::string16& tooltip);
void SetEnabled(bool is_enabled);
void SetWantsToRun(bool wants_to_run);
+ void SetDisabledClickOpensMenu(bool disabled_click_opens_menu);
int execute_action_count() const { return execute_action_count_; }
@@ -65,6 +67,9 @@ class TestToolbarActionViewController : public ToolbarActionViewController {
// Whether or not the action wants to run. Defaults to false.
bool wants_to_run_;
+ // Whether or not a click on a disabled action should open the context menu.
+ bool disabled_click_opens_menu_;
+
// The number of times the action would have been executed.
int execute_action_count_;
« no previous file with comments | « chrome/browser/ui/toolbar/media_router_action.cc ('k') | chrome/browser/ui/toolbar/test_toolbar_action_view_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698