Update some secondary UI buttons to MD style.

chrome/browser/ui/views/profiles/profile_chooser_view.cc

 // Copyright 2014 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 "chrome/browser/ui/views/profiles/profile_chooser_view.h"
 
 #include "base/macros.h"
 #include "base/metrics/user_metrics.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 28 matching lines @@
 #include "components/signin/core/browser/profile_oauth2_token_service.h"
 #include "components/signin/core/browser/signin_error_controller.h"
 #include "components/signin/core/browser/signin_header_helper.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "components/signin/core/common/profile_management_switches.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/user_metrics.h"
 #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"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/image/canvas_image_source.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/gfx/path.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/gfx/text_elider.h"
 #include "ui/gfx/vector_icons_public.h"
 #include "ui/native_theme/common_theme.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/views/controls/button/blue_button.h"
 #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"
 #include "ui/views/controls/separator.h"
 #include "ui/views/controls/styled_label.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/controls/webview/webview.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/layout/grid_layout.h"
@@ skipping 1201 matching lines @@
   content_label->SetMultiLine(true);
   content_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   content_label->SetAutoColorReadabilityEnabled(false);
   content_label->SetEnabledColor(profiles::kAvatarTutorialContentTextColor);
   layout->StartRowWithPadding(1, 0, 0, views::kRelatedControlVerticalSpacing);
   layout->AddView(content_label);
 
   // 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 appropriate kind of button based
on this switch. Here I have to do something slightly different for pre-md and
non-md, so I have to use the switch. That said, I've changed this code to also
use that factory because I want to get rid of public uses of SetStyle().

+      *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 white matches the link text color
on L1305. Made them share a const.

+    } 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();
   if (has_link) {
     *link = CreateLink(link_text, this);
     (*link)->SetHorizontalAlignment(gfx::ALIGN_LEFT);
     (*link)->SetAutoColorReadabilityEnabled(false);
     (*link)->SetEnabledColor(SK_ColorWHITE);
   }
 
@@ skipping 579 matching lines @@
       IncognitoModePrefs::GetAvailability(browser_->profile()->GetPrefs()) !=
           IncognitoModePrefs::DISABLED;
   return incognito_available && !browser_->profile()->IsGuestSession();
 }
 
 void ProfileChooserView::PostActionPerformed(
     ProfileMetrics::ProfileDesktopMenu action_performed) {
   ProfileMetrics::LogProfileDesktopMenu(action_performed, gaia_service_type_);
   gaia_service_type_ = signin::GAIA_SERVICE_TYPE_NONE;
 }