[Views] Make MenuButton track its desired state while pressed

ui/views/controls/button/menu_button.cc

 // 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.
 
 #include "ui/views/controls/button/menu_button.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/l10n/l10n_util.h"
@@ skipping 54 matching lines @@
                        MenuButtonListener* menu_button_listener,
                        bool show_menu_marker)
     : LabelButton(listener, text),
       menu_offset_(kDefaultMenuOffsetX, kDefaultMenuOffsetY),
       listener_(menu_button_listener),
       show_menu_marker_(show_menu_marker),
       menu_marker_(ui::ResourceBundle::GetSharedInstance().GetImageNamed(
           IDR_MENU_DROPARROW).ToImageSkia()),
       destroyed_flag_(NULL),
       pressed_lock_count_(0),
+      should_disable_after_press_(false),
       weak_factory_(this) {
   SetHorizontalAlignment(gfx::ALIGN_LEFT);
 }
 
 MenuButton::~MenuButton() {
   if (destroyed_flag_)
     *destroyed_flag_ = true;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ skipping 216 matching lines @@
     ui::EventType active_on =
         GetDragOperations(mouseev.location()) == ui::DragDropTypes::DRAG_NONE
             ? ui::ET_MOUSE_PRESSED
             : ui::ET_MOUSE_RELEASED;
     return event.type() == active_on;
   }
 
   return event.type() == ui::ET_GESTURE_TAP;
 }
 
+void MenuButton::StateChanged() {
+  if (pressed_lock_count_ != 0) {
+    // The button's state was changed while it was supposed to be locked in a
+    // pressed state. This shouldn't happen, but conceivably could if a caller
+    // tries to switch from enabled to disabled or vice versa while the button
+    // is pressed.
+    if (state() == STATE_NORMAL)
+      should_disable_after_press_ = false;
+    else if (state() == STATE_DISABLED)
+      should_disable_after_press_ = true;
+  }
+}
+
 void MenuButton::IncrementPressedLocked() {
   ++pressed_lock_count_;
+  should_disable_after_press_ = state() == STATE_DISABLED;
   SetState(STATE_PRESSED);
 }
 
 void MenuButton::DecrementPressedLocked() {
   --pressed_lock_count_;
   DCHECK_GE(pressed_lock_count_, 0);
 
-  // If this was the last lock, manually reset state to "normal". We set
-  // "normal" and not "hot" because the likelihood is that the mouse is now
-  // somewhere else (user clicked elsewhere on screen to close the menu or
-  // selected an item) and we will inevitably refresh the hot state in the event
-  // the mouse _is_ over the view.
-  if (pressed_lock_count_ == 0)
-    SetState(STATE_NORMAL);
+  // If this was the last lock, manually reset state to the desired state.
+  if (pressed_lock_count_ == 0) {
+    ButtonState desired_state = STATE_NORMAL;
+    if (should_disable_after_press_) {
+      desired_state = STATE_DISABLED;
+      should_disable_after_press_ = false;
+    } else if (IsMouseHovered()) {
+      desired_state = STATE_HOVERED;
+    }
+    SetState(desired_state);
+  }
 }
 
 int MenuButton::GetMaximumScreenXCoordinate() {
   if (!GetWidget()) {
     NOTREACHED();
     return 0;
   }
 
   gfx::Rect monitor_bounds = GetWidget()->GetWorkAreaBoundsInScreen();
   return monitor_bounds.right() - 1;
 }
 
 }  // namespace views