[Views] Make MenuButton track its desired state while pressed

ui/views/controls/button/menu_button_unittest.cc

 // Copyright 2014 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/memory/scoped_ptr.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/events/test/event_generator.h"
@@ skipping 330 matching lines @@
   pressed_lock1.reset();
   EXPECT_EQ(Button::STATE_PRESSED, button()->state());
 
   // Reseting the final lock should return the button's state to normal...
   pressed_lock2.reset();
   EXPECT_EQ(Button::STATE_NORMAL, button()->state());
 
   // ...And it should respond to mouse movement again.
   generator.MoveMouseTo(gfx::Point(10, 10));
   EXPECT_EQ(Button::STATE_HOVERED, button()->state());
+
+  // Test that the button returns to the appropriate state after the press; if
+  // the mouse ends over the button, the button should be hovered.
+  pressed_lock1.reset(new MenuButton::PressedLock(button()));
+  EXPECT_EQ(Button::STATE_PRESSED, button()->state());
+  pressed_lock1.reset();
+  EXPECT_EQ(Button::STATE_HOVERED, button()->state());
+
+  // If the button is disabled before the pressed lock, it should be disabled
+  // after the pressed lock.
+  button()->SetState(Button::STATE_DISABLED);
+  pressed_lock1.reset(new MenuButton::PressedLock(button()));
+  EXPECT_EQ(Button::STATE_PRESSED, button()->state());
+  pressed_lock1.reset();
+  EXPECT_EQ(Button::STATE_DISABLED, button()->state());
+
+  generator.MoveMouseTo(gfx::Point(300, 10));
+
+  // Edge case: the button is disabled, a pressed lock is added, and then the
+  // button is re-enabled. It should be enabled after the lock is removed.
+  pressed_lock1.reset(new MenuButton::PressedLock(button()));
+  EXPECT_EQ(Button::STATE_PRESSED, button()->state());
+  button()->SetState(Button::STATE_NORMAL);
+  pressed_lock1.reset();
+  EXPECT_EQ(Button::STATE_NORMAL, button()->state());
 }
 
 // Test that the MenuButton does not become pressed if it can be dragged, until
 // a release occurs.
 TEST_F(MenuButtonTest, DraggableMenuButtonActivatesOnRelease) {
   TestMenuButtonListener menu_button_listener;
   CreateMenuButtonWithMenuButtonListener(&menu_button_listener);
   TestDragController drag_controller;
   button()->set_drag_controller(&drag_controller);
 
@@ skipping 53 matching lines @@
   generator.PressTouch();
   EXPECT_EQ(Button::STATE_HOVERED, button()->state());
 
   generator.MoveTouch(gfx::Point(10, 30));
   generator.ReleaseTouch();
   EXPECT_EQ(Button::STATE_NORMAL, button()->state());
   EXPECT_EQ(nullptr, menu_button_listener.last_source());
 }
 
 }  // namespace views