Disambiguate OnMouseCaptureLost from OnMouseReleased, etc.

views/controls/button/menu_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/menu_button.h"
 
 #include "base/utf_string_conversions.h"
 #include "grit/app_strings.h"
 #include "grit/app_resources.h"
 #include "ui/base/accessibility/accessible_view_state.h"
@@ skipping 180 matching lines @@
       TimeDelta delta = Time::Now() - menu_closed_time_;
       int64 delta_in_milliseconds = delta.InMilliseconds();
       if (delta_in_milliseconds > kMinimumTimeBetweenButtonClicks) {
         return Activate();
       }
     }
   }
   return true;
 }
 
-void MenuButton::OnMouseReleased(const MouseEvent& event, bool canceled) {
+void MenuButton::OnMouseReleased(const MouseEvent& event) {
   // Explicitly test for left mouse button to show the menu. If we tested for
   // !IsTriggerableEvent it could lead to a situation where we end up showing
   // the menu and context menu (this would happen if the right button is not
   // triggerable and there's a context menu).
   if (GetDragOperations(event.location()) != ui::DragDropTypes::DRAG_NONE &&
-      state() != BS_DISABLED && !canceled && !InDrag() &&
-      event.IsOnlyLeftMouseButton() && HitTest(event.location())) {
+      state() != BS_DISABLED && !InDrag() && event.IsOnlyLeftMouseButton() &&
+      HitTest(event.location())) {
     Activate();
   } else {
-    TextButton::OnMouseReleased(event, canceled);
+    TextButton::OnMouseReleased(event);
   }
 }
 
 // The reason we override View::OnMouseExited is because we get this event when
 // we display the menu. If we don't override this method then
 // BaseButton::OnMouseExited will get the event and will set the button's state
 // to BS_NORMAL instead of keeping the state BM_PUSHED. This, in turn, will
 // cause the button to appear depressed while the menu is displayed.
 void MenuButton::OnMouseExited(const MouseEvent& event) {
   if ((state_ != BS_DISABLED) && (!menu_visible_) && (!InDrag())) {
@@ skipping 37 matching lines @@
     NOTREACHED();
     return 0;
   }
 
   gfx::Rect monitor_bounds =
       Screen::GetMonitorWorkAreaNearestWindow(GetWidget()->GetNativeView());
   return monitor_bounds.right() - 1;
 }
 
 }  // namespace views