Adds OnClickCanceled callback to views::Button

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/events/event.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/keycodes/keyboard_codes.h"
@@ skipping 119 matching lines @@
     SetState(ShouldEnterHoveredState() ? STATE_HOVERED : STATE_NORMAL);
   else
     SetState(STATE_DISABLED);
 }
 
 const char* CustomButton::GetClassName() const {
   return kViewClassName;
 }
 
 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) {
-      NotifyClick(event);
-      // NOTE: We may be deleted at this point (by the listener's notification
-      // handler).
-    }
+  if (state_ == STATE_DISABLED)
+    return true;
+  if (ShouldEnterPushedState(event) && HitTestPoint(event.location()))
+    SetState(STATE_PRESSED);
+  if (request_focus_on_press_)
+    RequestFocus();
+  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) {
     if (HitTestPoint(event.location()))
       SetState(ShouldEnterPushedState(event) ? STATE_PRESSED : STATE_HOVERED);
     else
       SetState(STATE_NORMAL);
   }
   return true;
 }
 
 void CustomButton::OnMouseReleased(const ui::MouseEvent& event) {
-  if (state_ == STATE_DISABLED)
-    return;
-
-  if (!HitTestPoint(event.location())) {
-    SetState(STATE_NORMAL);
-    return;
+  if (state_ != STATE_DISABLED) {
+    if (!HitTestPoint(event.location())) {
+      SetState(STATE_NORMAL);
+    } 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;
+      }
+    }
   }
-
-  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).
-  }
+  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())
     SetState(STATE_NORMAL);
 }
 
 void CustomButton::OnMouseEntered(const ui::MouseEvent& event) {
   if (state_ != STATE_DISABLED)
@@ skipping 218 matching lines @@
   return GetWidget() && GetWidget()->GetTopLevelWidget() != GetWidget();
 }
 
 bool CustomButton::FocusInChildWidget() const {
   return GetWidget() &&
          GetWidget()->GetRootView()->Contains(
              GetFocusManager()->GetFocusedView());
 }
 
 }  // namespace views