Resets hover state when ToolbarActionView is dragged

ui/views/controls/button/custom_button_unittest.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/custom_button.h"
 
 #include "base/macros.h"
 #include "build/build_config.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/layout.h"
+#include "ui/base/material_design/material_design_controller.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/test/event_generator.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/animation/ink_drop_delegate.h"
 #include "ui/views/animation/ink_drop_host.h"
 #include "ui/views/animation/test/test_ink_drop_host.h"
 #include "ui/views/controls/button/checkbox.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/button/menu_button.h"
@@ skipping 92 matching lines @@
     set_ink_drop_delegate(ink_drop_delegate_.get());
   }
   ~TestButtonWithInkDrop() override {}
 
  private:
   scoped_ptr<views::InkDropDelegate> ink_drop_delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(TestButtonWithInkDrop);
 };
 
+}  // namespace
+
 class CustomButtonTest : public ViewsTestBase {
  public:
   CustomButtonTest() {}
   ~CustomButtonTest() override {}
 
   void SetUp() override {
     ViewsTestBase::SetUp();
 
     // Create a widget so that the CustomButton can query the hover state
     // correctly.
@@ skipping 19 matching lines @@
     ink_hidden_ = false;
     button_ = new TestButtonWithInkDrop(&ink_shown_, &ink_hidden_);
     widget_->SetContentsView(button_);
   }
 
  protected:
   Widget* widget() { return widget_.get(); }
   TestCustomButton* button() { return button_; }
   bool ink_shown() const { return ink_shown_; }
   bool ink_hidden() const { return ink_hidden_; }
+  void SetDraggedView(View* dragged_view) {
+    widget_->dragged_view_ = dragged_view;
+  }
 
  private:
   scoped_ptr<Widget> widget_;
   TestCustomButton* button_;
   bool ink_shown_ = false;
   bool ink_hidden_ = false;
 
   DISALLOW_COPY_AND_ASSIGN(CustomButtonTest);
 };
 
-}  // namespace
-
 // Tests that hover state changes correctly when visiblity/enableness changes.
 TEST_F(CustomButtonTest, HoverStateOnVisibilityChange) {
   ui::test::EventGenerator generator(GetContext(), widget()->GetNativeWindow());
 
   generator.PressLeftButton();
   EXPECT_EQ(CustomButton::STATE_PRESSED, button()->state());
 
   generator.ReleaseLeftButton();
   EXPECT_EQ(CustomButton::STATE_HOVERED, button()->state());
 
@@ skipping 201 matching lines @@
   generator.set_current_location(gfx::Point(50, 50));
   generator.PressLeftButton();
   EXPECT_TRUE(ink_shown());
   EXPECT_FALSE(ink_hidden());
 
   generator.ReleaseLeftButton();
   EXPECT_FALSE(ink_hidden());
 }
 
 // Tests that pressing a button shows and releasing capture hides ink drop.
+// Releasing capture should also reset PRESSED button state to NORMAL.
 TEST_F(CustomButtonTest, CaptureLossHidesInkDrop) {
   gfx::Point old_cursor = gfx::Screen::GetScreen()->GetCursorScreenPoint();
   CreateButtonWithInkDrop();
 
   ui::test::EventGenerator generator(GetContext(), widget()->GetNativeWindow());
   generator.set_current_location(gfx::Point(50, 50));
   generator.PressLeftButton();
   EXPECT_TRUE(ink_shown());
   EXPECT_FALSE(ink_hidden());
 
+  EXPECT_EQ(Button::ButtonState::STATE_PRESSED, button()->state());
+  SetDraggedView(button());
   widget()->SetCapture(button());
   widget()->ReleaseCapture();
+  SetDraggedView(nullptr);
   EXPECT_TRUE(ink_hidden());
+  EXPECT_EQ(ui::MaterialDesignController::IsModeMaterial()
+                ? Button::ButtonState::STATE_NORMAL
+                : Button::ButtonState::STATE_PRESSED,
+            button()->state());
 }
 
 }  // namespace views