MdTextButton: get rid of distinct "default" styling and make all

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 197 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();
   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()),
@@ skipping 75 matching lines @@
       theme->GetSystemColor(ui::NativeTheme::kColorId_DialogBackground);
 
   if (bg_color_override_) {
     bg_color = *bg_color_override_;
   } else if (is_cta_) {
     bg_color = theme->GetSystemColor(
         ui::NativeTheme::kColorId_CallToActionColor);
     if (state() == STATE_DISABLED)
       bg_color = color_utils::BlendTowardOppositeLuma(
           bg_color, gfx::kDisabledControlAlpha);
-  } else if (is_default()) {
-    bg_color = color_utils::BlendTowardOppositeLuma(text_color, 0xD8);
   }
 
   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))
                              ? 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