MD - use new style of text button in infobars.

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 "chrome/browser/infobars/infobar_service.h"
@@ skipping 53 matching lines @@
 
 void ConfirmInfoBar::ViewHierarchyChanged(
     const ViewHierarchyChangedDetails& details) {
   if (details.is_add && details.child == this && (label_ == NULL)) {
     ConfirmInfoBarDelegate* delegate = GetDelegate();
     label_ = CreateLabel(delegate->GetMessageText());
     AddViewToContentArea(label_);
 
     if (delegate->GetButtons() & ConfirmInfoBarDelegate::BUTTON_OK) {
       if (delegate->OKButtonTriggersUACPrompt()) {
         // Use a label button even in MD mode as MD buttons don't support icons.

[Peter Kasting, 2016/03/09 07:18:10]

Has this been fixed?  We do still want the button to show an elevation icon if
need be.

If so this comment should be removed.

[Evan Stade, 2016/03/10 02:41:42]

Right, good call, comment removed and code cleaned up. I couldn't test for real
because this only works on windows but it looks good when I stick a stand-in
image in there.

-        views::LabelButton* ok_button = CreateLabelButton(
+        views::LabelButton* ok_button = CreateTextButton(
             this, delegate->GetButtonLabel(ConfirmInfoBarDelegate::BUTTON_OK));
         elevation_icon_setter_.reset(new ElevationIconSetter(
             ok_button,
             base::Bind(&ConfirmInfoBar::Layout, base::Unretained(this))));
         ok_button_ = ok_button;
       } else {
         ok_button_ = CreateTextButton(
             this, delegate->GetButtonLabel(ConfirmInfoBarDelegate::BUTTON_OK));
       }
       AddViewToContentArea(ok_button_);
@@ skipping 52 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);
 }