Resets hover state when ToolbarActionView is dragged

ui/views/controls/button/custom_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/custom_button.h"
 
 #include "ui/accessibility/ax_view_state.h"
+#include "ui/base/material_design/material_design_controller.h"
 #include "ui/events/event.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/animation/throb_animation.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/animation/ink_drop_delegate.h"
 #include "ui/views/animation/ink_drop_hover.h"
 #include "ui/views/controls/button/blue_button.h"
 #include "ui/views/controls/button/checkbox.h"
@@ skipping 160 matching lines @@
         // handler).
         return;
       }
     }
   }
   if (notify_action_ == NOTIFY_ON_RELEASE)
     OnClickCanceled(event);
 }
 
 void CustomButton::OnMouseCaptureLost() {
-  // Starting a drag results in a MouseCaptureLost, we need to ignore it.
-  if (state_ != STATE_DISABLED && !InDrag())
+  // Starting a drag results in a MouseCaptureLost. Reset button state.
+  // TODO(varkha) While in drag only reset the state with Material Design.
+  // The same logic may applies everywhere so gather any feedback and update.
+  bool reset_button_state =
+      !InDrag() || ui::MaterialDesignController::IsModeMaterial();
+  if (state_ != STATE_DISABLED && reset_button_state)
     SetState(STATE_NORMAL);
   if (ink_drop_delegate_)
     ink_drop_delegate_->OnAction(views::InkDropState::HIDDEN);
 }
 
 void CustomButton::OnMouseEntered(const ui::MouseEvent& event) {
   if (state_ != STATE_DISABLED)
     SetState(STATE_HOVERED);
 }
 
@@ skipping 223 matching lines @@
   Button::NotifyClick(event);
 }
 
 void CustomButton::OnClickCanceled(const ui::Event& event) {
   if (ink_drop_delegate())
     ink_drop_delegate()->OnAction(views::InkDropState::HIDDEN);
   Button::OnClickCanceled(event);
 }
 
 }  // namespace views