Fix style of profile error dialog.

ui/views/controls/button/md_text_button.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/controls/button/md_text_button.h"
 
 #include "base/i18n/case_conversion.h"
 #include "base/memory/ptr_util.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/gfx/canvas.h"
@@ skipping 13 matching lines @@
 #include "ui/views/style/platform_style.h"
 #include "ui/views/style/typography.h"
 
 namespace views {
 
 namespace {
 
 LabelButton* CreateButton(ButtonListener* listener,
                           const base::string16& text,
                           bool md) {
+#if !defined(OS_MACOSX)
   if (md)
+#endif  // !defined(OS_MACOSX)

[tapted, 2017/06/09 01:43:48]

I try to avoid #ifdefs intertwining with branching. I suggest a helper:

bool IsMaterialDefault() {
#if defined(OS_MACOSX)
  return true;
#else
  return ui::MaterialDesignController::IsSecondaryUiMaterial();
#endif
}

[Peter Kasting, 2017/06/09 02:21:47]

This, but I would call it UseMaterialSecondaryButtons().

[afakhry, 2017/06/09 17:32:10]

Done.

[afakhry, 2017/06/09 17:32:10]

Done.

     return MdTextButton::Create(listener, text, style::CONTEXT_BUTTON_MD);
 
+#if !defined(OS_MACOSX)
   LabelButton* button = new LabelButton(listener, text, style::CONTEXT_BUTTON);
   button->SetStyleDeprecated(CustomButton::STYLE_BUTTON);
   return button;
+#endif  // !defined(OS_MACOSX)
 }
 
 }  // namespace
 
 // static
 LabelButton* MdTextButton::CreateSecondaryUiButton(ButtonListener* listener,
                                                    const base::string16& text) {
   return CreateButton(listener, text,
                       ui::MaterialDesignController::IsSecondaryUiMaterial());

[tapted, 2017/06/09 01:43:48]

and here pass IsMaterialDefault()

[afakhry, 2017/06/09 17:32:10]

Done.

 }
 
 // static
 LabelButton* MdTextButton::CreateSecondaryUiBlueButton(
     ButtonListener* listener,
     const base::string16& text) {
+#if !defined(OS_MACOSX)
   if (ui::MaterialDesignController::IsSecondaryUiMaterial()) {

[tapted, 2017/06/09 01:43:48]

also here. Then remove all the #if.

[afakhry, 2017/06/09 17:32:10]

Done.

+#endif  // !defined(OS_MACOSX)
     MdTextButton* md_button =
         MdTextButton::Create(listener, text, style::CONTEXT_BUTTON_MD);
     md_button->SetProminent(true);
     return md_button;
+#if !defined(OS_MACOSX)
   }
 
   return new BlueButton(listener, text);
+#endif  // !defined(OS_MACOSX)
 }
 
 // static
 MdTextButton* MdTextButton::Create(ButtonListener* listener,
                                    const base::string16& text,
                                    int button_context) {
   MdTextButton* button = new MdTextButton(listener, button_context);
   button->SetText(text);
   button->SetFocusForPlatform();
   return button;
@@ skipping 210 matching lines @@
   }
 
   DCHECK_EQ(SK_AlphaOPAQUE, static_cast<int>(SkColorGetA(bg_color)));
   SetBackground(
       CreateBackgroundFromPainter(Painter::CreateRoundRectWith1PxBorderPainter(
           bg_color, stroke_color, kInkDropSmallCornerRadius)));
   SchedulePaint();
 }
 
 }  // namespace views