[Views] Make MenuButton track its desired state while pressed

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"
@@ skipping 69 matching lines @@
 
  protected:
   // Paint the menu marker image.
   void PaintMenuMarker(gfx::Canvas* canvas);
 
   // Overridden from LabelButton:
   gfx::Rect GetChildAreaBounds() override;
 
   // Overridden from CustomButton:
   bool ShouldEnterPushedState(const ui::Event& event) override;
+  void StateChanged() override;
 
   // 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 IncrementPressedLocked();
@@ skipping 20 matching lines @@
   // 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_;
 
+  // True if the button was in a disabled state when a menu was run, and should
+  // return to it once the press is complete. This can happen if, e.g., we
+  // programmatically show a menu on a disabled button.
+  bool should_disable_after_press_;
+
   base::WeakPtrFactory<MenuButton> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MenuButton);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_BUTTON_MENU_BUTTON_H_