Make normal MD text buttons *on infobars* white.

chrome/browser/ui/views/infobars/infobar_view.cc

 // Copyright (c) 2012 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/infobars/infobar_view.h"
 
 #include <algorithm>
 #include <memory>
 #include <utility>
 
@@ skipping 46 matching lines @@
       label_2->GetPreferredSize().width();
 }
 
 const gfx::FontList& GetFontList() {
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   return rb.GetFontList(ui::MaterialDesignController::IsModeMaterial()
                             ? ui::ResourceBundle::BaseFont
                             : ui::ResourceBundle::MediumFont);
 }
 
-SkColor GetInfobarTextColor() {
+constexpr SkColor GetInfobarTextColor() {
   return SK_ColorBLACK;
 }
 
 }  // namespace
 
 
 // InfoBarView ----------------------------------------------------------------
 
 // static
 const int InfoBarView::kButtonButtonSpacing = views::kRelatedButtonHSpacing;
 const int InfoBarView::kEndOfLabelSpacing = views::kItemLabelSpacing;
+const SkColor InfoBarView::kTextColor = GetInfobarTextColor();
 
 InfoBarView::InfoBarView(std::unique_ptr<infobars::InfoBarDelegate> delegate)
     : infobars::InfoBar(std::move(delegate)),
       views::ExternalFocusTracker(this, nullptr),
       child_container_(new views::View()),
       icon_(nullptr),
       close_button_(nullptr) {
   set_owned_by_client();  // InfoBar deletes itself at the appropriate time.
   set_background(
       new InfoBarBackground(infobars::InfoBar::delegate()->GetInfoBarType()));
@@ skipping 71 matching lines @@
   button->set_animate_on_state_change(false);
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   button->SetFontList(rb.GetFontList(ui::ResourceBundle::MediumFont));
   button->SetFocusForPlatform();
   button->set_request_focus_on_press(true);
   button->SetTextColor(views::Button::STATE_NORMAL, GetInfobarTextColor());
   button->SetTextColor(views::Button::STATE_HOVERED, GetInfobarTextColor());
   return button;
 }
 
-views::MdTextButton* InfoBarView::CreateMdTextButton(
-    views::ButtonListener* listener,
-    const base::string16& text) {
-  DCHECK(ui::MaterialDesignController::IsModeMaterial());
-  views::MdTextButton* button =
-      views::MdTextButton::CreateMdButton(listener, text);
-  // TODO(estade): can we just remove this?
-  button->SetEnabledTextColors(GetInfobarTextColor());
-  return button;
-}
-
 // static
 void InfoBarView::AssignWidths(Labels* labels, int available_width) {
   std::sort(labels->begin(), labels->end(), SortLabelsByDecreasingWidth);
   AssignWidthsSorted(labels, available_width);
 }
 
 void InfoBarView::Layout() {
   // Calculate the fill and stroke paths.  We do this here, rather than in
   // PlatformSpecificRecalculateHeight(), because this is also reached when our
   // width is changed, which affects both paths.
@@ skipping 246 matching lines @@
 }
 
 bool InfoBarView::DoesIntersectRect(const View* target,
                                     const gfx::Rect& rect) const {
   DCHECK_EQ(this, target);
   // Only events that intersect the portion below the arrow are interesting.
   gfx::Rect non_arrow_bounds = GetLocalBounds();
   non_arrow_bounds.Inset(0, arrow_height(), 0, 0);
   return rect.Intersects(non_arrow_bounds);
 }