| Index: views/controls/button/radio_button.h
|
| ===================================================================
|
| --- views/controls/button/radio_button.h (revision 86135)
|
| +++ views/controls/button/radio_button.h (working copy)
|
| @@ -13,13 +13,13 @@
|
| class NativeRadioButtonGtk;
|
|
|
| // A Checkbox subclass representing a radio button.
|
| -class RadioButton : public Checkbox {
|
| +class NativeRadioButton : public Checkbox {
|
| public:
|
| // The button's class name.
|
| static const char kViewClassName[];
|
|
|
| - RadioButton(const std::wstring& label, int group_id);
|
| - virtual ~RadioButton();
|
| + NativeRadioButton(const std::wstring& label, int group_id);
|
| + virtual ~NativeRadioButton();
|
|
|
| // Overridden from Checkbox:
|
| virtual void SetChecked(bool checked) OVERRIDE;
|
| @@ -43,27 +43,25 @@
|
|
|
| NativeButtonWrapper* native_wrapper() { return native_wrapper_; }
|
|
|
| - DISALLOW_COPY_AND_ASSIGN(RadioButton);
|
| + DISALLOW_COPY_AND_ASSIGN(NativeRadioButton);
|
| };
|
|
|
| // A native themed class representing a radio button. This class does not use
|
| // platform specific objects to replicate the native platforms looks and feel.
|
| -//
|
| -// This class will eventually be renamed to RadioButton to replace the class
|
| -// above.
|
| -class RadioButtonNt : public CheckboxNt {
|
| +class RadioButton : public CheckboxNt {
|
| public:
|
| // The button's class name.
|
| static const char kViewClassName[];
|
|
|
| - RadioButtonNt(const std::wstring& label, int group_id);
|
| - virtual ~RadioButtonNt();
|
| + RadioButton(const std::wstring& label, int group_id);
|
| + virtual ~RadioButton();
|
|
|
| // Overridden from View:
|
| virtual std::string GetClassName() const OVERRIDE;
|
| virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
|
| virtual View* GetSelectedViewForGroup(int group_id) OVERRIDE;
|
| virtual bool IsGroupFocusTraversable() const OVERRIDE;
|
| + virtual void OnFocus() OVERRIDE;
|
|
|
| // Overridden from Button:
|
| virtual void NotifyClick(const views::Event& event) OVERRIDE;
|
| @@ -74,7 +72,7 @@
|
| // Overridden from CheckboxNt:
|
| virtual void SetChecked(bool checked) OVERRIDE;
|
|
|
| - DISALLOW_COPY_AND_ASSIGN(RadioButtonNt);
|
| + DISALLOW_COPY_AND_ASSIGN(RadioButton);
|
| };
|
|
|
| } // namespace views
|
|
|