Add SetProminent() to MdTextButton to create blue buttons.

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 "ui/base/material_design/material_design_controller.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_palette.h"
@@ skipping 89 matching lines @@
   return CreateButton(listener, text,
                       ui::MaterialDesignController::IsSecondaryUiMaterial());
 }
 
 // static
 LabelButton* MdTextButton::CreateSecondaryUiBlueButton(
     ButtonListener* listener,
     const base::string16& text) {
   if (ui::MaterialDesignController::IsSecondaryUiMaterial()) {
     MdTextButton* md_button = MdTextButton::Create(listener, text);
-    md_button->SetCallToAction(true);
+    md_button->SetProminent(true);
     return md_button;
   }
 
   return new BlueButton(listener, text);
 }
 
 // static
 MdTextButton* MdTextButton::Create(ButtonListener* listener,
                                    const base::string16& text) {
   MdTextButton* button = new MdTextButton(listener);
   button->SetText(text);
   button->SetFocusForPlatform();
   return button;
 }
 
-void MdTextButton::SetCallToAction(bool cta) {
-  if (is_cta_ == cta)
+void MdTextButton::SetProminent(bool is_prominent) {
+  if (is_prominent_ == is_prominent)
     return;
 
-  is_cta_ = cta;
+  is_prominent_ = is_prominent;
   UpdateColors();
 }
 
 void MdTextButton::Layout() {
   LabelButton::Layout();
   gfx::Rect focus_bounds = GetLocalBounds();
   focus_bounds.Inset(gfx::Insets(-kFocusBorderThickness));
   focus_ring_->SetBoundsRect(focus_bounds);
 }
 
@@ skipping 26 matching lines @@
 
 void MdTextButton::StateChanged() {
   LabelButton::StateChanged();
   UpdateColors();
 }
 
 std::unique_ptr<views::InkDropHighlight> MdTextButton::CreateInkDropHighlight()
     const {
   if (!ShouldShowInkDropHighlight())
     return nullptr;
-  if (!is_cta_)
+  if (!is_prominent_)
     return LabelButton::CreateInkDropHighlight();
 
-  // The call to action hover effect is a shadow.
+  // The prominent button hover effect is a shadow.
   const int kYOffset = 1;
   const int kSkiaBlurRadius = 1;
   std::vector<gfx::ShadowValue> shadows;
   // The notion of blur that gfx::ShadowValue uses is twice the Skia/CSS value.
   // Skia counts the number of pixels outside the mask area whereas
   // gfx::ShadowValue counts together the number of pixels inside and outside
   // the mask bounds.
   shadows.push_back(gfx::ShadowValue(gfx::Vector2d(0, kYOffset),
                                      2 * kSkiaBlurRadius,
                                      SkColorSetA(SK_ColorBLACK, 0x3D)));
@@ skipping 17 matching lines @@
   LabelButton::SetText(text);
   UpdatePadding();
 }
 
 void MdTextButton::AdjustFontSize(int size_delta) {
   LabelButton::AdjustFontSize(size_delta);
   UpdatePadding();
 }
 
 void MdTextButton::UpdateStyleToIndicateDefaultStatus() {
-  is_cta_ = is_cta_ || is_default();
+  is_prominent_ = is_prominent_ || is_default();
   UpdateColors();
 }
 
 void MdTextButton::SetFontList(const gfx::FontList& font_list) {
   NOTREACHED()
       << "Don't call MdTextButton::SetFontList (it will soon be protected)";
 }
 
 MdTextButton::MdTextButton(ButtonListener* listener)
     : LabelButton(listener, base::string16()),
       focus_ring_(new internal::MdFocusRing()),
-      is_cta_(false) {
+      is_prominent_(false) {
   SetInkDropMode(PlatformStyle::kUseRipples ? InkDropMode::ON
                                             : InkDropMode::OFF);
   set_has_ink_drop_action_on_click(true);
   SetHorizontalAlignment(gfx::ALIGN_CENTER);
   SetFocusForPlatform();
   SetMinSize(gfx::Size(kMinWidth, 0));
   SetFocusPainter(nullptr);
   label()->SetAutoColorReadabilityEnabled(false);
   AddChildView(focus_ring_);
   focus_ring_->SetVisible(false);
@@ skipping 39 matching lines @@
 
   // TODO(estade): can we get rid of the platform style border hoopla if
   // we apply the MD treatment to all buttons, even GTK buttons?
   const int kHorizontalPadding = 16;
   SetBorder(Border::CreateEmptyBorder(top_padding, kHorizontalPadding,
                                       bottom_padding, kHorizontalPadding));
 }
 
 void MdTextButton::UpdateColors() {
   ui::NativeTheme::ColorId fg_color_id =
-      is_cta_ ? ui::NativeTheme::kColorId_TextOnCallToActionColor
-              : ui::NativeTheme::kColorId_ButtonEnabledColor;
+      is_prominent_ ? ui::NativeTheme::kColorId_TextOnProminentButtonColor
+                    : ui::NativeTheme::kColorId_ButtonEnabledColor;
 
   ui::NativeTheme* theme = GetNativeTheme();
   if (!explicitly_set_normal_color())
     LabelButton::SetEnabledTextColors(theme->GetSystemColor(fg_color_id));
 
-  // CTA buttons keep their enabled text color; disabled state is conveyed by
-  // shading the background instead.
-  if (is_cta_)
+  // Proinent buttons keep their enabled text color; disabled state is conveyed

[sky, 2016/09/27 17:38:32]

Prominent

[shrike, 2016/09/27 17:52:51]

Eek. Done.

+  // by shading the background instead.
+  if (is_prominent_)
     SetTextColor(STATE_DISABLED, theme->GetSystemColor(fg_color_id));
 
   SkColor text_color = label()->enabled_color();
   SkColor bg_color =
       theme->GetSystemColor(ui::NativeTheme::kColorId_DialogBackground);
 
   if (bg_color_override_) {
     bg_color = *bg_color_override_;
-  } else if (is_cta_) {
+  } else if (is_prominent_) {
     bg_color = theme->GetSystemColor(
-        ui::NativeTheme::kColorId_CallToActionColor);
+        ui::NativeTheme::kColorId_ProminentButtonColor);
     if (state() == STATE_DISABLED)
       bg_color = color_utils::BlendTowardOppositeLuma(
           bg_color, gfx::kDisabledControlAlpha);
   }
 
   if (state() == STATE_PRESSED) {
     SkColor shade =
         theme->GetSystemColor(ui::NativeTheme::kColorId_ButtonPressedShade);
     bg_color = color_utils::GetResultingPaintColor(shade, bg_color);
   }
 
   const SkAlpha kStrokeOpacity = 0x1A;
-  SkColor stroke_color = (is_cta_ || color_utils::IsDark(text_color))
+  SkColor stroke_color = (is_prominent_ || color_utils::IsDark(text_color))
                              ? SkColorSetA(SK_ColorBLACK, kStrokeOpacity)
                              : SkColorSetA(SK_ColorWHITE, 2 * kStrokeOpacity);
 
   DCHECK_EQ(SK_AlphaOPAQUE, static_cast<int>(SkColorGetA(bg_color)));
   set_background(Background::CreateBackgroundPainter(
       true, Painter::CreateRoundRectWith1PxBorderPainter(
                 bg_color, stroke_color, kInkDropSmallCornerRadius)));
 }
 
 }  // namespace views