Variety of tweaks to View API.

views/controls/button/radio_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/radio_button.h"
 
 #include "base/logging.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "views/widget/widget.h"
 
 namespace views {
 
 // static
 const char RadioButton::kViewClassName[] = "views/RadioButton";
 
 // static
 const char RadioButtonNt::kViewClassName[] = "views/RadioButtonNt";
 
 ////////////////////////////////////////////////////////////////////////////////
 // RadioButton, public:
 
 RadioButton::RadioButton(const std::wstring& label, int group_id)
     : Checkbox(label) {
-  SetGroup(group_id);
+  set_group(group_id);
 }
 
 RadioButton::~RadioButton() {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // RadioButton, Checkbox overrides:
 
 void RadioButton::SetChecked(bool checked) {
   if (checked == RadioButton::checked())
     return;
   if (native_wrapper_ &&
       !native_wrapper_->UsesNativeRadioButtonGroup() && checked) {
     // We can't just get the root view here because sometimes the radio
     // button isn't attached to a root view (e.g., if it's part of a tab page
     // that is currently not active).
     View* container = parent();
     while (container && container->parent())
       container = container->parent();
     if (container) {
       std::vector<View*> other;
-      container->GetViewsWithGroup(GetGroup(), &other);
+      container->GetViewsInGroup(group(), &other);
       std::vector<View*>::iterator i;
       for (i = other.begin(); i != other.end(); ++i) {
         if (*i != this) {
           if ((*i)->GetClassName() != kViewClassName) {
             NOTREACHED() << "radio-button has same group as other non "
                             "radio-button views.";
             continue;
           }
           RadioButton* peer = static_cast<RadioButton*>(*i);
           peer->SetChecked(false);
         }
       }
     }
   }
   Checkbox::SetChecked(checked);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // RadioButton, View overrides:
 
 void RadioButton::GetAccessibleState(ui::AccessibleViewState* state) {
   Checkbox::GetAccessibleState(state);
   state->role = ui::AccessibilityTypes::ROLE_RADIOBUTTON;
 }
 
 View* RadioButton::GetSelectedViewForGroup(int group_id) {
   std::vector<View*> views;
-  GetWidget()->GetRootView()->GetViewsWithGroup(group_id, &views);
+  GetWidget()->GetRootView()->GetViewsInGroup(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;
@@ skipping 31 matching lines @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // RadioButtonNt
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 RadioButtonNt::RadioButtonNt(const std::wstring& label, int group_id)
     : CheckboxNt(label) {
-  SetGroup(group_id);
+  set_group(group_id);
 }
 
 RadioButtonNt::~RadioButtonNt() {
 }
 
 void RadioButtonNt::SetChecked(bool checked) {
   if (checked == RadioButtonNt::checked())
     return;
   if (checked) {
     // We can't just get the root view here because sometimes the radio
     // button isn't attached to a root view (e.g., if it's part of a tab page
     // that is currently not active).
     View* container = parent();
     while (container && container->parent())
       container = container->parent();
     if (container) {
       std::vector<View*> other;
-      container->GetViewsWithGroup(GetGroup(), &other);
+      container->GetViewsInGroup(group(), &other);
       std::vector<View*>::iterator i;
       for (i = other.begin(); i != other.end(); ++i) {
         if (*i != this) {
           if ((*i)->GetClassName() != kViewClassName) {
             NOTREACHED() << "radio-button-nt has same group as other non "
                             "radio-button-nt views.";
             continue;
           }
           RadioButtonNt* peer = static_cast<RadioButtonNt*>(*i);
           peer->SetChecked(false);
         }
       }
     }
   }
   CheckboxNt::SetChecked(checked);
 }
 
 std::string RadioButtonNt::GetClassName() const {
   return kViewClassName;
 }
 
 void RadioButtonNt::GetAccessibleState(ui::AccessibleViewState* state) {
   CheckboxNt::GetAccessibleState(state);
   state->role = ui::AccessibilityTypes::ROLE_RADIOBUTTON;
 }
 
 View* RadioButtonNt::GetSelectedViewForGroup(int group_id) {
   std::vector<View*> views;
-  GetWidget()->GetRootView()->GetViewsWithGroup(group_id, &views);
+  GetWidget()->GetRootView()->GetViewsInGroup(group_id, &views);
   if (views.empty())
     return NULL;
 
   for (std::vector<View*>::const_iterator iter = views.begin();
        iter != views.end(); ++iter) {
     // REVIEW: why don't we check the runtime type like is done above?
     RadioButtonNt* radio_button = static_cast<RadioButtonNt*>(*iter);
     if (radio_button->checked())
       return radio_button;
   }
@@ skipping 12 matching lines @@
   if (!checked())
     SetChecked(true);
   RequestFocus();
 }
 
 gfx::NativeTheme::Part RadioButtonNt::GetThemePart() const {
   return gfx::NativeTheme::kRadio;
 }
 
 }  // namespace views