| Index: ui/views/controls/button/label_button.cc
|
| diff --git a/ui/views/controls/button/label_button.cc b/ui/views/controls/button/label_button.cc
|
| index 30db5d13d9aaba4a4f82b96f9f6a922214e68fb9..fe245a0bc2b05dbd42910a70835eb09002d00a42 100644
|
| --- a/ui/views/controls/button/label_button.cc
|
| +++ b/ui/views/controls/button/label_button.cc
|
| @@ -37,7 +37,7 @@ const int LabelButton::kHoverAnimationDurationMs = 170;
|
| // static
|
| const char LabelButton::kViewClassName[] = "LabelButton";
|
|
|
| -LabelButton::LabelButton(ButtonListener* listener, const string16& text)
|
| +LabelButton::LabelButton(ButtonListener* listener, const base::string16& text)
|
| : CustomButton(listener),
|
| image_(new ImageView()),
|
| label_(new Label()),
|
| @@ -75,11 +75,11 @@ void LabelButton::SetImage(ButtonState for_state, const gfx::ImageSkia& image) {
|
| UpdateImage();
|
| }
|
|
|
| -const string16& LabelButton::GetText() const {
|
| +const base::string16& LabelButton::GetText() const {
|
| return label_->text();
|
| }
|
|
|
| -void LabelButton::SetText(const string16& text) {
|
| +void LabelButton::SetText(const base::string16& text) {
|
| SetAccessibleName(text);
|
| label_->SetText(text);
|
| }
|
|
|