Remove pre-MD infobar code (on Views).

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 54 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 = views::MdTextButton::Create(
-            this, delegate->GetButtonLabel(ConfirmInfoBarDelegate::BUTTON_OK));
-        button->SetCallToAction(true);
-        ok_button_ = button;
-      } else {
-        ok_button_ = CreateTextButton(
-            this, delegate->GetButtonLabel(ConfirmInfoBarDelegate::BUTTON_OK));
-      }
+      ok_button_ = views::MdTextButton::Create(
+          this, delegate->GetButtonLabel(ConfirmInfoBarDelegate::BUTTON_OK));
+      ok_button_->SetCallToAction(true);
       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 = views::MdTextButton::Create(
-            this,
-            delegate->GetButtonLabel(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;
+      cancel_button_ = views::MdTextButton::Create(
+          this,
+          delegate->GetButtonLabel(ConfirmInfoBarDelegate::BUTTON_CANCEL));
+      if (delegate->GetButtons() == ConfirmInfoBarDelegate::BUTTON_CANCEL) {
+        // Apply CTA only if the cancel button is the only button.
+        cancel_button_->SetCallToAction(true);
       } else {
-        cancel_button_ = CreateTextButton(
-            this,
-            delegate->GetButtonLabel(ConfirmInfoBarDelegate::BUTTON_CANCEL));
+        // 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.

[Peter Kasting, 2016/09/19 19:04:06]

Were you waiting on removing pre-MD to implement this TODO?  Just wondering if
there are still blockers or it should be done during the "rip out pre-MD" phase.

[Evan Stade, 2016/09/19 20:06:02]

the blocker at this point is figuring out an elegant way to apply the normal
native theme to infobars. If we just remove this right now we get a red button
on incognito infobars (because there's no color defined for the normal button).
We also get a slightly wrong bg color for the call to action case, but it's just
the wrong shade of blue so doesn't look terrible.

[Peter Kasting, 2016/09/19 20:12:48]

Ah.  Is there a bug tracking figuring this out?  I'm fine with punting it, just
don't want it to get lost.

+        cancel_button_->set_bg_color_override(SK_ColorWHITE);
+        cancel_button_->SetEnabledTextColors(kTextColor);
       }
       AddViewToContentArea(cancel_button_);
       cancel_button_->SizeToPreferredSize();
     }
 
     base::string16 link_text(delegate->GetLinkText());
     link_ = CreateLink(link_text, this);
     AddViewToContentArea(link_);
   }
 
@@ skipping 36 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);
 }