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..b37b6759bc4a7e2c508dd3a5d466e69efd54c40d 100644 |
--- a/ui/views/controls/button/label_button.cc |
+++ b/ui/views/controls/button/label_button.cc |
@@ -390,7 +390,14 @@ void LabelButton::EnableCanvasFlippingForRTLUI(bool flip) { |
} |
std::unique_ptr<LabelButtonBorder> LabelButton::CreateDefaultBorder() const { |
Evan Stade
2016/09/22 22:21:10
harmony should allow us to get rid of this complet
|
- return PlatformStyle::CreateLabelButtonBorder(style()); |
+ if (!ui::MaterialDesignController::IsModeMaterial() || |
+ style_ != Button::STYLE_TEXTBUTTON) { |
+ return base::MakeUnique<LabelButtonAssetBorder>(style_); |
+ } |
+ std::unique_ptr<LabelButtonBorder> border(new views::LabelButtonBorder()); |
sky
2016/09/23 15:47:39
MakeUnique?
|
+ border->set_insets(views::LabelButtonAssetBorder::GetDefaultInsetsForStyle( |
+ style_)); |
+ return border; |
} |
void LabelButton::SetBorder(std::unique_ptr<Border> border) { |