Adds OnClickCanceled callback to views::Button

ui/views/controls/button/custom_button.cc

Index: ui/views/controls/button/custom_button.cc
diff --git a/ui/views/controls/button/custom_button.cc b/ui/views/controls/button/custom_button.cc
index 7bab3b69e4a007ea44ba4d15264ad40d641df674..d9a655d093887484abefd6a7a31cd93740ae705a 100644
--- a/ui/views/controls/button/custom_button.cc
+++ b/ui/views/controls/button/custom_button.cc
@@ -128,15 +128,19 @@ const char* CustomButton::GetClassName() const {
 }
 
 bool CustomButton::OnMousePressed(const ui::MouseEvent& event) {
-  if (state_ != STATE_DISABLED) {
-    if (ShouldEnterPushedState(event) && HitTestPoint(event.location()))
-      SetState(STATE_PRESSED);
-    if (request_focus_on_press_)
-      RequestFocus();
-    if (IsTriggerableEvent(event) && notify_action_ == NOTIFY_ON_PRESS) {
+  if (state_ == STATE_DISABLED)
+    return true;
+  if (ShouldEnterPushedState(event) && HitTestPoint(event.location()))
+    SetState(STATE_PRESSED);
+  if (request_focus_on_press_)
+    RequestFocus();
+  if (notify_action_ == NOTIFY_ON_PRESS) {
+    if (IsTriggerableEvent(event)) {
       NotifyClick(event);
       // NOTE: We may be deleted at this point (by the listener's notification
       // handler).
+    } else {
+      NotifyReleasedWithoutClick(event);
     }
   }
   return true;
@@ -155,18 +159,19 @@ bool CustomButton::OnMouseDragged(const ui::MouseEvent& event) {
 void CustomButton::OnMouseReleased(const ui::MouseEvent& event) {
   if (state_ == STATE_DISABLED)
     return;
-
   if (!HitTestPoint(event.location())) {
     SetState(STATE_NORMAL);
-    return;
-  }
-
-  SetState(STATE_HOVERED);
-  if (IsTriggerableEvent(event) && notify_action_ == NOTIFY_ON_RELEASE) {
-    NotifyClick(event);
-    // NOTE: We may be deleted at this point (by the listener's notification
-    // handler).
+  } else {
+    SetState(STATE_HOVERED);
+    if (IsTriggerableEvent(event) && notify_action_ == NOTIFY_ON_RELEASE) {
+      NotifyClick(event);
+      // NOTE: We may be deleted at this point (by the listener's notification
+      // handler).
+      return;
+    }
   }
+  if (notify_action_ == NOTIFY_ON_RELEASE)
+    NotifyReleasedWithoutClick(event);
 }
 
 void CustomButton::OnMouseCaptureLost() {