| 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 c883169c6c1c7e74f8aea4ea66f17171ab032beb..68a347286166806eacd855ee7b0db6dac6a7733d 100644
|
| --- a/ui/views/controls/button/label_button.cc
|
| +++ b/ui/views/controls/button/label_button.cc
|
| @@ -390,7 +390,15 @@ void LabelButton::EnableCanvasFlippingForRTLUI(bool flip) {
|
| }
|
|
|
| std::unique_ptr<LabelButtonBorder> LabelButton::CreateDefaultBorder() const {
|
| - return PlatformStyle::CreateLabelButtonBorder(style());
|
| + if (!ui::MaterialDesignController::IsModeMaterial() ||
|
| + style_ != Button::STYLE_TEXTBUTTON) {
|
| + return base::MakeUnique<LabelButtonAssetBorder>(style_);
|
| + }
|
| + std::unique_ptr<LabelButtonBorder> border =
|
| + base::MakeUnique<LabelButtonBorder>();
|
| + border->set_insets(views::LabelButtonAssetBorder::GetDefaultInsetsForStyle(
|
| + style_));
|
| + return border;
|
| }
|
|
|
| void LabelButton::SetBorder(std::unique_ptr<Border> border) {
|
|
|