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_; |