Keep reference view pressed while extension actions have a popup

ui/views/controls/button/menu_button.h

 // Copyright (c) 2012 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.
 
 #ifndef UI_VIEWS_CONTROLS_BUTTON_MENU_BUTTON_H_
 #define UI_VIEWS_CONTROLS_BUTTON_MENU_BUTTON_H_
 
 #include <string>
 
+#include "base/memory/weak_ptr.h"
 #include "base/strings/string16.h"
 #include "base/time/time.h"
 #include "ui/views/background.h"
 #include "ui/views/controls/button/label_button.h"
 
 namespace views {
 
 class MenuButtonListener;
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // MenuButton
 //
 //  A button that shows a menu when the left mouse button is pushed
 //
 ////////////////////////////////////////////////////////////////////////////////
 class VIEWS_EXPORT MenuButton : public LabelButton {
  public:
+  // A scoped lock for keeping the MenuButton in STATE_PRESSED e.g., while a
+  // menu is running. These are cumulative.
+  class PressedLock {

[sky, 2014/09/19 21:21:59]

How about some test coverage here?

[Devlin, 2014/09/19 22:37:48]

Of course.  Just wanted to make sure this approach was sound before writing 'em.
:)

+   public:
+    PressedLock(MenuButton* menu_button);

[sky, 2014/09/19 21:21:59]

explicit.

[Devlin, 2014/09/19 22:37:49]

Done.

+    ~PressedLock();
+
+   private:
+    base::WeakPtr<MenuButton> menu_button_;
+
+    DISALLOW_COPY_AND_ASSIGN(PressedLock);
+  };
+
   static const char kViewClassName[];
 
   // How much padding to put on the left and right of the menu marker.
   static const int kMenuMarkerPaddingLeft;
   static const int kMenuMarkerPaddingRight;
 
   // Create a Button.
   MenuButton(ButtonListener* listener,
              const base::string16& text,
              MenuButtonListener* menu_button_listener,
@@ skipping 11 matching lines @@
 
   // Activate the button (called when the button is pressed).
   virtual bool Activate();
 
   // Overridden from View:
   virtual gfx::Size GetPreferredSize() const OVERRIDE;
   virtual const char* GetClassName() const OVERRIDE;
   virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
   virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE;
   virtual void OnMouseReleased(const ui::MouseEvent& event) OVERRIDE;
+  virtual void OnMouseEntered(const ui::MouseEvent& event) OVERRIDE;
   virtual void OnMouseExited(const ui::MouseEvent& event) OVERRIDE;
+  virtual void OnMouseMoved(const ui::MouseEvent& event) OVERRIDE;
   virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
   virtual bool OnKeyPressed(const ui::KeyEvent& event) OVERRIDE;
   virtual bool OnKeyReleased(const ui::KeyEvent& event) OVERRIDE;
   virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE;
 
  protected:
   // Paint the menu marker image.
   void PaintMenuMarker(gfx::Canvas* canvas);
 
   // Overridden from LabelButton:
   virtual gfx::Rect GetChildAreaBounds() OVERRIDE;
 
-  // True if the menu is currently visible.
-  bool menu_visible_;
-
   // Offset of the associated menu position.
   gfx::Point menu_offset_;
 
  private:
+  friend class PressedLock;
+
+  // Increment/decrement the number of "pressed" locks this button has, and
+  // set the state accordingly.
+  void PressedLocked();

[sky, 2014/09/19 21:21:59]

nit: IncrementPressedLocked, DecrementPressedLocked.

[Devlin, 2014/09/19 22:37:48]

Done.

+  void PressedUnlocked();
+
   // Compute the maximum X coordinate for the current screen. MenuButtons
   // use this to make sure a menu is never shown off screen.
   int GetMaximumScreenXCoordinate();
 
   // We use a time object in order to keep track of when the menu was closed.
   // The time is used for simulating menu behavior for the menu button; that
   // is, if the menu is shown and the button is pressed, we need to close the
   // menu. There is no clean way to get the second click event because the
   // menu is displayed using a modal loop and, unlike regular menus in Windows,
   // the button is not part of the displayed menu.
   base::TimeTicks menu_closed_time_;
 
   // Our listener. Not owned.
   MenuButtonListener* listener_;
 
   // Whether or not we're showing a drop marker.
   bool show_menu_marker_;
 
   // The down arrow used to differentiate the menu button from normal buttons.
   const gfx::ImageSkia* menu_marker_;
 
   // If non-null the destuctor sets this to true. This is set while the menu is
   // showing and used to detect if the menu was deleted while running.
   bool* destroyed_flag_;
 
+  // The current number of "pressed" locks this button has.
+  int pressed_lock_count_;
+
+  base::WeakPtrFactory<MenuButton> weak_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(MenuButton);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_BUTTON_MENU_BUTTON_H_