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

Unified Diff: chrome/browser/ui/views/toolbar/toolbar_action_view.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/views/toolbar/toolbar_action_view.h
diff --git a/chrome/browser/ui/views/toolbar/toolbar_action_view.h b/chrome/browser/ui/views/toolbar/toolbar_action_view.h
index 4559cdf8c7c5da4097c6d2f7d0ef749283fe0a50..2ee23b5ee196ca81412b0b24b68b8a6f9c35dec3 100644
--- a/chrome/browser/ui/views/toolbar/toolbar_action_view.h
+++ b/chrome/browser/ui/views/toolbar/toolbar_action_view.h
@@ -141,6 +141,12 @@ class ToolbarActionView : public views::MenuButton,
// Returns true if a menu was closed, false otherwise.
bool CloseActiveMenuIfNeeded();
+ // Unfortunately, due to the dual-nature of a ToolbarActionView as both a
+ // label button and a menu button, activation can happen as part of either
+ // ButtonPressed() or Activate(). Handle both in this function.
+ void HandleActivation(const gfx::Point& menu_point,
+ ui::MenuSourceType source_type);
+
// A lock to keep the MenuButton pressed when a menu or popup is visible.
scoped_ptr<views::MenuButton::PressedLock> pressed_lock_;
« no previous file with comments | « chrome/browser/ui/toolbar/toolbar_action_view_controller.h ('k') | chrome/browser/ui/views/toolbar/toolbar_action_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698