diff options
author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-12 13:32:23 +0000 |
---|---|---|
committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-12 13:32:23 +0000 |
commit | c8d71d105c95cd631ebc0d159e31ffc71774d25b (patch) | |
tree | 98c587eba7e799c6b530914f4730e58271d5b896 /views/controls/button | |
parent | cb16e5e394534e72b01fe16986e9dad19ecd0516 (diff) | |
download | chromium_src-c8d71d105c95cd631ebc0d159e31ffc71774d25b.zip chromium_src-c8d71d105c95cd631ebc0d159e31ffc71774d25b.tar.gz chromium_src-c8d71d105c95cd631ebc0d159e31ffc71774d25b.tar.bz2 |
views: Change RadioButton API to string16.
BUG=68267
R=sky@chromium.org
Review URL: http://codereview.chromium.org/8229017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105067 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls/button')
-rw-r--r-- | views/controls/button/radio_button.cc | 11 | ||||
-rw-r--r-- | views/controls/button/radio_button.h | 4 |
2 files changed, 6 insertions, 9 deletions
diff --git a/views/controls/button/radio_button.cc b/views/controls/button/radio_button.cc index ae2376c..ebf16cd 100644 --- a/views/controls/button/radio_button.cc +++ b/views/controls/button/radio_button.cc @@ -5,6 +5,7 @@ #include "views/controls/button/radio_button.h" #include "base/logging.h" +#include "base/utf_string_conversions.h" #include "ui/base/accessibility/accessible_view_state.h" #include "views/widget/widget.h" @@ -13,14 +14,8 @@ namespace views { // static const char RadioButton::kViewClassName[] = "views/RadioButton"; -//////////////////////////////////////////////////////////////////////////////// -// -// RadioButton -// -//////////////////////////////////////////////////////////////////////////////// - -RadioButton::RadioButton(const std::wstring& label, int group_id) - : Checkbox(label) { +RadioButton::RadioButton(const string16& label, int group_id) + : Checkbox(UTF16ToWideHack(label)) { SetGroup(group_id); set_focusable(true); } diff --git a/views/controls/button/radio_button.h b/views/controls/button/radio_button.h index c9d3711..f3a1195 100644 --- a/views/controls/button/radio_button.h +++ b/views/controls/button/radio_button.h @@ -6,6 +6,7 @@ #define VIEWS_CONTROLS_BUTTON_RADIO_BUTTON_H_ #pragma once +#include "base/string16.h" #include "views/controls/button/checkbox.h" namespace views { @@ -17,7 +18,7 @@ class VIEWS_EXPORT RadioButton : public Checkbox { // The button's class name. static const char kViewClassName[]; - RadioButton(const std::wstring& label, int group_id); + RadioButton(const string16& label, int group_id); virtual ~RadioButton(); // Overridden from View: @@ -36,6 +37,7 @@ class VIEWS_EXPORT RadioButton : public Checkbox { // Overridden from Checkbox: virtual void SetChecked(bool checked) OVERRIDE; + private: DISALLOW_COPY_AND_ASSIGN(RadioButton); }; |