Chromium Code Reviews| Index: chrome/browser/ui/views/profiles/profile_chooser_view.cc |
| diff --git a/chrome/browser/ui/views/profiles/profile_chooser_view.cc b/chrome/browser/ui/views/profiles/profile_chooser_view.cc |
| index ba23c02554232f27906667e8e486c22b56d40fc0..7b204a869ebbc02c0581b889713b4c962592f468 100644 |
| --- a/chrome/browser/ui/views/profiles/profile_chooser_view.cc |
| +++ b/chrome/browser/ui/views/profiles/profile_chooser_view.cc |
| @@ -46,6 +46,7 @@ |
| #include "grit/theme_resources.h" |
| #include "third_party/skia/include/core/SkColor.h" |
| #include "ui/base/l10n/l10n_util.h" |
| +#include "ui/base/material_design/material_design_controller.h" |
| #include "ui/base/resource/resource_bundle.h" |
| #include "ui/compositor/clip_recorder.h" |
| #include "ui/gfx/canvas.h" |
| @@ -64,6 +65,7 @@ |
| #include "ui/views/controls/button/image_button.h" |
| #include "ui/views/controls/button/label_button.h" |
| #include "ui/views/controls/button/label_button_border.h" |
| +#include "ui/views/controls/button/md_text_button.h" |
| #include "ui/views/controls/button/menu_button.h" |
| #include "ui/views/controls/label.h" |
| #include "ui/views/controls/link.h" |
| @@ -1285,9 +1287,14 @@ views::View* ProfileChooserView::CreateTutorialView( |
| // Adds links and buttons. |
| bool has_button = !button_text.empty(); |
| if (has_button) { |
| - *button = new views::LabelButton(this, button_text); |
| - (*button)->SetHorizontalAlignment(gfx::ALIGN_CENTER); |
| - (*button)->SetStyle(views::Button::STYLE_BUTTON); |
| + if (ui::MaterialDesignController::IsSecondaryUiMaterial()) { |
|
msw
2016/05/12 19:17:04
q: why isn't this needed elsewhere?
Evan Stade
2016/05/12 19:32:02
because the factory in MdTextButton creates the ap
|
| + *button = views::MdTextButton::CreateMdButton(this, button_text); |
| + (*button)->SetEnabledTextColors(SK_ColorWHITE); |
|
msw
2016/05/12 19:17:04
nit: use a theme color?
Evan Stade
2016/05/12 19:32:02
this isn't a surface that can be themed. This whit
|
| + } else { |
| + *button = new views::LabelButton(this, button_text); |
| + (*button)->SetStyle(views::Button::STYLE_BUTTON); |
| + (*button)->SetHorizontalAlignment(gfx::ALIGN_CENTER); |
| + } |
| } |
| bool has_link = !link_text.empty(); |