Disambiguate OnMouseCaptureLost from OnMouseReleased, etc.

views/controls/button/button_dropdown.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/button_dropdown.h"
 
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "grit/app_strings.h"
@@ skipping 55 matching lines @@
     // it immediately.
     if (event.y() > y_position_on_lbuttondown_ + GetHorizontalDragThreshold()) {
       show_menu_factory_.RevokeAll();
       ShowDropDownMenu(GetWidget()->GetNativeView());
     }
   }
 
   return result;
 }
 
-void ButtonDropDown::OnMouseReleased(const MouseEvent& event, bool canceled) {
-  // Showing the drop down results in a MouseReleased with a canceled drag, we
-  // need to ignore it.
-  if (!canceled && (IsTriggerableEvent(event) ||
-      (event.IsRightMouseButton() && !HitTest(event.location())))) {
-    ImageButton::OnMouseReleased(event, canceled);
+void ButtonDropDown::OnMouseReleased(const MouseEvent& event) {
+  if (IsTriggerableEvent(event) ||
+      (event.IsRightMouseButton() && !HitTest(event.location()))) {
+    ImageButton::OnMouseReleased(event);
   }
 
-  if (canceled)
-    return;
-
   if (IsTriggerableEvent(event))
     show_menu_factory_.RevokeAll();
 
   if (IsEnabled() && event.IsRightMouseButton() && HitTest(event.location())) {
     show_menu_factory_.RevokeAll();
     ShowDropDownMenu(GetWidget()->GetNativeView());
   }
 }
 
 void ButtonDropDown::OnMouseExited(const MouseEvent& event) {
@@ skipping 63 matching lines @@
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // ButtonDropDown - Accessibility
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 }  // namespace views