Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(130)

Unified Diff: ui/views/window/dialog_client_view.cc

Issue 2922263002: Fix style of profile error dialog. (Closed)
Patch Set: tapted's and pkasting's comments Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/controls/button/md_text_button.cc ('k') | ui/views/window/dialog_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 a9414fb419fdfd6e68bf511993ba4fda84e86a7d..0e4a4c3415af6a765b7d4ebe7eb65868bde23ab6 100644
--- a/ui/views/window/dialog_client_view.cc
+++ b/ui/views/window/dialog_client_view.cc
@@ -282,13 +282,8 @@ void DialogClientView::UpdateDialogButton(LabelButton** member,
(type != ui::DIALOG_BUTTON_CANCEL ||
PlatformStyle::kDialogDefaultButtonCanBeCancel);
- // The default button is always blue in Harmony.
- if (is_default && (ui::MaterialDesignController::IsSecondaryUiMaterial() ||
- delegate->ShouldDefaultButtonBeBlue())) {
- button = MdTextButton::CreateSecondaryUiBlueButton(this, title);
- } else {
- button = MdTextButton::CreateSecondaryUiButton(this, title);
- }
+ button = is_default ? MdTextButton::CreateSecondaryUiBlueButton(this, title)
+ : MdTextButton::CreateSecondaryUiButton(this, title);
const int minimum_width = LayoutProvider::Get()->GetDistanceMetric(
views::DISTANCE_DIALOG_BUTTON_MINIMUM_WIDTH);
« no previous file with comments | « ui/views/controls/button/md_text_button.cc ('k') | ui/views/window/dialog_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698