Index: ui/views/window/dialog_client_view.cc |
diff --git a/ui/views/window/dialog_client_view.cc b/ui/views/window/dialog_client_view.cc |
index fb92712b4bf8ef971ccacde94dafb459df39fe83..ce9099fb3931760943a25b2c403845c99979f70e 100644 |
--- a/ui/views/window/dialog_client_view.cc |
+++ b/ui/views/window/dialog_client_view.cc |
@@ -314,9 +314,11 @@ void DialogClientView::ChildVisibilityChanged(View* child) { |
LabelButton* DialogClientView::CreateDialogButton(ui::DialogButton type) { |
const base::string16 title = GetDialogDelegate()->GetDialogButtonLabel(type); |
LabelButton* button = nullptr; |
+ // The default button is always blue in Harmony. |
if (GetDialogDelegate()->GetDefaultDialogButton() == type && |
- GetDialogDelegate()->ShouldDefaultButtonBeBlue()) { |
- return MdTextButton::CreateSecondaryUiBlueButton(this, title); |
+ (ui::MaterialDesignController::IsSecondaryUiMaterial() || |
+ GetDialogDelegate()->ShouldDefaultButtonBeBlue())) { |
+ button = MdTextButton::CreateSecondaryUiBlueButton(this, title); |
} else { |
button = MdTextButton::CreateSecondaryUiButton(this, title); |
} |