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 10 matching lines @@
 scoped_ptr<infobars::InfoBar> InfoBarService::CreateConfirmInfoBar(
     scoped_ptr<ConfirmInfoBarDelegate> delegate) {
   return make_scoped_ptr(new ConfirmInfoBar(std::move(delegate)));
 }
 
 
 // ConfirmInfoBar -------------------------------------------------------------
 
 ConfirmInfoBar::ConfirmInfoBar(scoped_ptr<ConfirmInfoBarDelegate> delegate)
     : InfoBarView(std::move(delegate)),
-      label_(NULL),
-      ok_button_(NULL),
-      cancel_button_(NULL),
-      link_(NULL) {}
+      label_(nullptr),
+      ok_button_(nullptr),
+      cancel_button_(nullptr),
+      link_(nullptr) {}
 
 ConfirmInfoBar::~ConfirmInfoBar() {
   // Ensure |elevation_icon_setter_| is destroyed before |ok_button_|.
   elevation_icon_setter_.reset();
 }
 
 void ConfirmInfoBar::Layout() {
   InfoBarView::Layout();
 
   int x = StartX();
@@ skipping 12 matching lines @@
   }
 
   if (cancel_button_)
     cancel_button_->SetPosition(gfx::Point(x, OffsetY(cancel_button_)));
 
   link_->SetPosition(gfx::Point(EndX() - link_->width(), OffsetY(link_)));
 }
 
 void ConfirmInfoBar::ViewHierarchyChanged(
     const ViewHierarchyChangedDetails& details) {
-  if (details.is_add && details.child == this && (label_ == NULL)) {
+  if (details.is_add && details.child == this && (label_ == nullptr)) {
     ConfirmInfoBarDelegate* delegate = GetDelegate();
     label_ = CreateLabel(delegate->GetMessageText());
     AddViewToContentArea(label_);
 
     if (delegate->GetButtons() & ConfirmInfoBarDelegate::BUTTON_OK) {
+      ok_button_ = CreateTextButton(
+          this, delegate->GetButtonLabel(ConfirmInfoBarDelegate::BUTTON_OK));
       if (delegate->OKButtonTriggersUACPrompt()) {
-        // Use a label button even in MD mode as MD buttons don't support icons.
-        views::LabelButton* ok_button = CreateLabelButton(
-            this, delegate->GetButtonLabel(ConfirmInfoBarDelegate::BUTTON_OK));
         elevation_icon_setter_.reset(new ElevationIconSetter(
-            ok_button,
+            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_);
       ok_button_->SizeToPreferredSize();
     }
 
     if (delegate->GetButtons() & ConfirmInfoBarDelegate::BUTTON_CANCEL) {
       cancel_button_ = CreateTextButton(
           this,
           delegate->GetButtonLabel(ConfirmInfoBarDelegate::BUTTON_CANCEL));
       AddViewToContentArea(cancel_button_);
@@ skipping 44 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);
 }