Cleanup:...

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

 // Copyright (c) 2011 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/infobars.h"
 
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/views/event_utils.h"
 #include "chrome/browser/ui/views/infobars/infobar_container.h"
@@ skipping 298 matching lines @@
     focus_tracker_.reset(NULL);
   }
 }
 
 void InfoBar::DeleteSelf() {
   delete this;
 }
 
 // AlertInfoBar, public: -------------------------------------------------------
 
-AlertInfoBar::AlertInfoBar(AlertInfoBarDelegate* delegate)
+AlertInfoBar::AlertInfoBar(ConfirmInfoBarDelegate* delegate)
     : InfoBar(delegate) {
   label_ = new views::Label(
       UTF16ToWideHack(delegate->GetMessageText()),
       ResourceBundle::GetSharedInstance().GetFont(ResourceBundle::MediumFont));
   label_->SetColor(SK_ColorBLACK);
   label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   AddChildView(label_);
 
   icon_ = new views::ImageView;
   if (delegate->GetIcon())
@@ skipping 16 matching lines @@
                    icon_ps.height());
 
   gfx::Size text_ps = label_->GetPreferredSize();
   int text_width = std::min(
       text_ps.width(),
       GetAvailableWidth() - icon_->bounds().right() - kIconLabelSpacing);
   label_->SetBounds(icon_->bounds().right() + kIconLabelSpacing,
                     OffsetY(this, text_ps), text_width, text_ps.height());
 }
 
-// AlertInfoBar, private: ------------------------------------------------------
-
-AlertInfoBarDelegate* AlertInfoBar::GetDelegate() {
-  return delegate()->AsAlertInfoBarDelegate();
-}
-
 // LinkInfoBar, public: --------------------------------------------------------
 
 LinkInfoBar::LinkInfoBar(LinkInfoBarDelegate* delegate)
     : InfoBar(delegate),
       icon_(new views::ImageView),
       label_1_(new views::Label),
       label_2_(new views::Label),
       link_(new views::Link) {
   // Set up the icon.
   if (delegate->GetIcon())
@@ skipping 219 matching lines @@
 ConfirmInfoBarDelegate* ConfirmInfoBar::GetDelegate() {
   return delegate()->AsConfirmInfoBarDelegate();
 }
 
 void ConfirmInfoBar::Init() {
   AddChildView(ok_button_);
   AddChildView(cancel_button_);
   AddChildView(link_);
 }
 
-// AlertInfoBarDelegate, InfoBarDelegate overrides: ----------------------------
-
-InfoBar* AlertInfoBarDelegate::CreateInfoBar() {
-  return new AlertInfoBar(this);
-}
-
 // LinkInfoBarDelegate, InfoBarDelegate overrides: -----------------------------
 
 InfoBar* LinkInfoBarDelegate::CreateInfoBar() {
   return new LinkInfoBar(this);
 }
 
 // ConfirmInfoBarDelegate, InfoBarDelegate overrides: --------------------------
 
 InfoBar* ConfirmInfoBarDelegate::CreateInfoBar() {
   return new ConfirmInfoBar(this);
 }