Fixed right-click/drag bug

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"
@@ skipping 146 matching lines @@
   if (IsTriggerableEvent(event) && notify_action_ == NOTIFY_ON_PRESS) {
     NotifyClick(event);
     // NOTE: We may be deleted at this point (by the listener's notification
     // handler).
   }
   return true;
 }
 
 bool CustomButton::OnMouseDragged(const ui::MouseEvent& event) {
   if (state_ != STATE_DISABLED) {
+    bool should_enter_pushed = ShouldEnterPushedState(event);
     if (HitTestPoint(event.location())) {
-      SetState(ShouldEnterPushedState(event) ? STATE_PRESSED : STATE_HOVERED);
-      if (!InDrag() && ink_drop_delegate() &&
+      SetState(should_enter_pushed ? STATE_PRESSED : STATE_HOVERED);
+      if (!InDrag() && should_enter_pushed && ink_drop_delegate() &&
           ink_drop_delegate()->GetTargetInkDropState() ==
               views::InkDropState::HIDDEN)
         ink_drop_delegate()->OnAction(views::InkDropState::ACTION_PENDING);
     } else {
       SetState(STATE_NORMAL);
-      if (!InDrag() && ink_drop_delegate() &&
+      if (!InDrag() && should_enter_pushed && ink_drop_delegate() &&
           ink_drop_delegate()->GetTargetInkDropState() ==
               views::InkDropState::ACTION_PENDING)
         ink_drop_delegate()->OnAction(views::InkDropState::HIDDEN);
     }
   }
   return true;
 }
 
 void CustomButton::OnMouseReleased(const ui::MouseEvent& event) {
   if (state_ != STATE_DISABLED) {
@@ skipping 283 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