Disambiguate OnMouseCaptureLost from OnMouseReleased, etc.

views/controls/button/custom_button.cc

 // Copyright (c) 2011 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 "views/controls/button/custom_button.h"
 
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/animation/throb_animation.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "views/screen.h"
@@ skipping 111 matching lines @@
 bool CustomButton::OnMouseDragged(const MouseEvent& event) {
   if (state_ != BS_DISABLED) {
     if (HitTest(event.location()))
       SetState(ShouldEnterPushedState(event) ? BS_PUSHED : BS_HOT);
     else
       SetState(BS_NORMAL);
   }
   return true;
 }
 
-void CustomButton::OnMouseReleased(const MouseEvent& event, bool canceled) {
+void CustomButton::OnMouseReleased(const MouseEvent& event) {
+  // TODO(msw): Is this still true? Perhaps the InDrag() check is unnecessary.

[msw, 2011/03/17 23:28:51]

Need guidance / testing; or leave as-is.

   // Starting a drag results in a MouseReleased, we need to ignore it.
   if ((state_ == BS_DISABLED) || InDrag())
     return;
 
   if (!HitTest(event.location())) {
     SetState(BS_NORMAL);
     return;
   }
 
   SetState(BS_HOT);
-  if (!canceled && IsTriggerableEvent(event)) {
+  if (IsTriggerableEvent(event)) {
     NotifyClick(event);
     // NOTE: We may be deleted at this point (by the listener's notification
     // handler).
   }
 }
 
+void CustomButton::OnMouseCaptureLost() {
+  // Starting a drag results in a MouseCaptureLost, we need to ignore it.
+  if (state_ != BS_DISABLED && !InDrag())
+    SetState(BS_NORMAL);
+}
+
 void CustomButton::OnMouseEntered(const MouseEvent& event) {
   if (state_ != BS_DISABLED)
     SetState(BS_HOT);
 }
 
 void CustomButton::OnMouseExited(const MouseEvent& event) {
   // Starting a drag results in a MouseExited, we need to ignore it.
   if (state_ != BS_DISABLED && !InDrag())
     SetState(BS_NORMAL);
 }
@@ skipping 116 matching lines @@
 bool CustomButton::IsFocusable() const {
   return (state_ != BS_DISABLED) && View::IsFocusable();
 }
 
 void CustomButton::OnBlur() {
   if (IsHotTracked())
     SetState(BS_NORMAL);
 }
 
 }  // namespace views