| 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 9dd1ba94979dc1c2f7bfb7714cad9fd4101869f7..2adef130a6947b7fb3f756db9765c2b97cacf5c1 100644
|
| --- a/ui/views/controls/button/label_button.cc
|
| +++ b/ui/views/controls/button/label_button.cc
|
| @@ -360,19 +360,14 @@ void LabelButton::UpdateThemedBorder() {
|
| if (!border_is_themed_border_)
|
| return;
|
|
|
| - scoped_ptr<LabelButtonBorder> label_button_border = CreateDefaultBorder();
|
| -
|
| + scoped_ptr<Border> border = CreateDefaultBorder().PassAs<Border>();
|
| #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
|
| views::LinuxUI* linux_ui = views::LinuxUI::instance();
|
| - if (linux_ui) {
|
| - SetBorder(linux_ui->CreateNativeBorder(
|
| - this, label_button_border.PassAs<Border>()));
|
| - } else
|
| + if (linux_ui)
|
| + border = linux_ui->CreateNativeBorder(this, border.Pass());
|
| #endif
|
| - {
|
| - SetBorder(label_button_border.PassAs<Border>());
|
| - }
|
|
|
| + SetBorder(border.Pass());
|
| border_is_themed_border_ = true;
|
| }
|
|
|
|
|