Make normal MD text buttons *on infobars* white.

chrome/browser/ui/views/infobars/confirm_infobar.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/confirm_infobar.h"
 
 #include <utility>
 
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
@@ skipping 55 matching lines @@
 
 void ConfirmInfoBar::ViewHierarchyChanged(
     const ViewHierarchyChangedDetails& details) {
   if (details.is_add && details.child == this && (label_ == nullptr)) {
     ConfirmInfoBarDelegate* delegate = GetDelegate();
     label_ = CreateLabel(delegate->GetMessageText());
     AddViewToContentArea(label_);
 
     if (delegate->GetButtons() & ConfirmInfoBarDelegate::BUTTON_OK) {
       if (ui::MaterialDesignController::IsModeMaterial()) {
-        views::MdTextButton* button = CreateMdTextButton(
+        views::MdTextButton* button = views::MdTextButton::CreateMdButton(
             this, delegate->GetButtonLabel(ConfirmInfoBarDelegate::BUTTON_OK));
         button->SetCallToAction(true);
         ok_button_ = button;
       } else {
         ok_button_ = CreateTextButton(
             this, delegate->GetButtonLabel(ConfirmInfoBarDelegate::BUTTON_OK));
       }
       if (delegate->OKButtonTriggersUACPrompt()) {
         elevation_icon_setter_.reset(new ElevationIconSetter(
             ok_button_,
             base::Bind(&ConfirmInfoBar::Layout, base::Unretained(this))));
       }
       AddViewToContentArea(ok_button_);
       ok_button_->SizeToPreferredSize();
     }
 
     if (delegate->GetButtons() & ConfirmInfoBarDelegate::BUTTON_CANCEL) {
       if (ui::MaterialDesignController::IsModeMaterial()) {
-        views::MdTextButton* button = CreateMdTextButton(
+        views::MdTextButton* button = views::MdTextButton::CreateMdButton(
             this,
             delegate->GetButtonLabel(ConfirmInfoBarDelegate::BUTTON_CANCEL));
-        // Apply CTA only if the cancel button is the only button.
-        button->SetCallToAction(delegate->GetButtons() ==
-                                ConfirmInfoBarDelegate::BUTTON_CANCEL);
+        if (delegate->GetButtons() == ConfirmInfoBarDelegate::BUTTON_CANCEL) {
+          // Apply CTA only if the cancel button is the only button.
+          button->SetCallToAction(true);
+        } else {
+          // Otherwise set the bg color to white and the text color to black.
+          // TODO(estade): These should be removed and moved into the native
+          // theme. Also, infobars should always use the normal (non-incognito)
+          // native theme.
+          button->set_bg_color_override(SK_ColorWHITE);
+          button->SetEnabledTextColors(kTextColor);
+        }
         cancel_button_ = button;
       } else {
         cancel_button_ = CreateTextButton(
             this,
             delegate->GetButtonLabel(ConfirmInfoBarDelegate::BUTTON_CANCEL));
       }
       AddViewToContentArea(cancel_button_);
       cancel_button_->SizeToPreferredSize();
     }
 
@@ skipping 41 matching lines @@
 }
 
 int ConfirmInfoBar::NonLabelWidth() const {
   int width = (label_->text().empty() || (!ok_button_ && !cancel_button_)) ?
       0 : kEndOfLabelSpacing;
   if (ok_button_)
     width += ok_button_->width() + (cancel_button_ ? kButtonButtonSpacing : 0);
   width += cancel_button_ ? cancel_button_->width() : 0;
   return width + ((link_->text().empty() || !width) ? 0 : kEndOfLabelSpacing);
 }