Disambiguate OnMouseCaptureLost from OnMouseReleased, etc.

views/controls/button/radio_button.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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/radio_button.h"
 
 #include "base/logging.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "views/widget/root_view.h"
 
 namespace views {
@@ skipping 42 matching lines @@
         }
       }
     }
   }
   Checkbox::SetChecked(checked);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // RadioButton, View overrides:
 
-void RadioButton::GetAccessibleState(ui::AccessibleViewState* state) {
-  Checkbox::GetAccessibleState(state);
-  state->role = ui::AccessibilityTypes::ROLE_RADIOBUTTON;
+std::string RadioButton::GetClassName() const {
+  return kViewClassName;
 }
 
 View* RadioButton::GetSelectedViewForGroup(int group_id) {
   std::vector<View*> views;
   GetRootView()->GetViewsWithGroup(group_id, &views);
   if (views.empty())
     return NULL;
 
   for (std::vector<View*>::const_iterator iter = views.begin();
        iter != views.end(); ++iter) {
     RadioButton* radio_button = static_cast<RadioButton*>(*iter);
     if (radio_button->checked())
       return radio_button;
   }
   return NULL;
 }
 
 bool RadioButton::IsGroupFocusTraversable() const {
   // When focusing a radio button with tab/shift+tab, only the selected button
   // from the group should be focused.
   return false;
 }
 
-void RadioButton::OnMouseReleased(const MouseEvent& event, bool canceled) {
+void RadioButton::OnMouseReleased(const MouseEvent& event) {
   native_wrapper_->SetPushed(false);
   // Set the checked state to true only if we are unchecked, since we can't
   // be toggled on and off like a checkbox.
-  if (!checked() && !canceled && HitTestLabel(event))
+  if (!checked() && HitTestLabel(event))
     SetChecked(true);
 
   ButtonPressed();
 }
 
-std::string RadioButton::GetClassName() const {
-  return kViewClassName;
+void RadioButton::OnMouseCaptureLost() {
+  native_wrapper_->SetPushed(false);
+  ButtonPressed();
+}
+
+void RadioButton::GetAccessibleState(ui::AccessibleViewState* state) {
+  Checkbox::GetAccessibleState(state);
+  state->role = ui::AccessibilityTypes::ROLE_RADIOBUTTON;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // RadioButton, NativeButton overrides:
 
 NativeButtonWrapper* RadioButton::CreateWrapper() {
   NativeButtonWrapper* native_wrapper =
       NativeButtonWrapper::CreateRadioButtonWrapper(this);
   native_wrapper->UpdateLabel();
   native_wrapper->UpdateChecked();
   return native_wrapper;
 }
 
 }  // namespace views