Cleanup:...

chrome/browser/autofill/autofill_cc_infobar_win.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/autofill/autofill_cc_infobar.h"
 
 #include "chrome/browser/ui/views/event_utils.h"
 #include "chrome/browser/ui/views/infobars/infobars.h"
 #include "chrome/browser/ui/views/infobars/infobar_text_button.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "views/controls/button/text_button.h"
 #include "views/controls/link.h"
 
-class SaveCCInfoConfirmInfoBar : public AlertInfoBar,
-                                 public views::LinkController  {
+class SaveCCInfoConfirmInfoBar : public ConfirmInfoBar {
  public:
   explicit SaveCCInfoConfirmInfoBar(ConfirmInfoBarDelegate* delegate);
   virtual ~SaveCCInfoConfirmInfoBar();
 
   // Overridden from views::View:
   virtual void Layout();
 
   // Overridden from views::LinkController:
   virtual void LinkActivated(views::Link* source, int event_flags);
 
@@ skipping 20 matching lines @@
   InfoBarTextButton* save_button_;
   InfoBarTextButton* dont_save_button_;
   views::Link* link_;
   bool initialized_;
 
   DISALLOW_COPY_AND_ASSIGN(SaveCCInfoConfirmInfoBar);
 };
 
 SaveCCInfoConfirmInfoBar::SaveCCInfoConfirmInfoBar(
     ConfirmInfoBarDelegate* delegate)
-    : AlertInfoBar(delegate),
+    : ConfirmInfoBar(delegate),
       initialized_(false) {
   save_button_ = InfoBarTextButton::Create(this,
       delegate->GetButtonLabel(ConfirmInfoBarDelegate::BUTTON_OK));
   dont_save_button_ = InfoBarTextButton::Create(this,
       delegate->GetButtonLabel(ConfirmInfoBarDelegate::BUTTON_CANCEL));
 
   // Set up the link.
   link_ = new views::Link;
   link_->SetText(delegate->GetLinkText());
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   link_->SetFont(rb.GetFont(ResourceBundle::MediumFont));
   link_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   link_->SetController(this);
   link_->MakeReadableOverBackgroundColor(background()->get_color());
 }
 
 SaveCCInfoConfirmInfoBar::~SaveCCInfoConfirmInfoBar() {
   if (!initialized_) {
     delete save_button_;
     delete dont_save_button_;
     delete link_;
   }
 }
 
 void SaveCCInfoConfirmInfoBar::Layout() {
   // Layout the close button.
   InfoBar::Layout();
 
-  int available_width = AlertInfoBar::GetAvailableWidth();
+  int available_width = ConfirmInfoBar::GetAvailableWidth();
 
   // Now append the link to the label's right edge.
   link_->SetVisible(!link_->GetText().empty());
   gfx::Size link_ps = link_->GetPreferredSize();
   int link_x = available_width - kButtonButtonSpacing - link_ps.width();
   link_->SetBounds(link_x, OffsetY(this, link_ps), link_ps.width(),
                    link_ps.height());
   available_width = link_x;
 
   // Layout the cancel and OK buttons.
   gfx::Size save_ps = save_button_->GetPreferredSize();
   gfx::Size dont_save_ps = dont_save_button_->GetPreferredSize();
 
   // Layout the icon and label.
-  AlertInfoBar::Layout();
+  ConfirmInfoBar::Layout();
 
   int save_x = label()->bounds().right() + kEndOfLabelSpacing;
   save_x = std::max(0, std::min(save_x, available_width - (save_ps.width() +
                     dont_save_ps.width() + kButtonButtonSpacing)));
 
   save_button_->SetVisible(true);
   dont_save_button_->SetVisible(true);
 
   save_button_->SetBounds(save_x, OffsetY(this, save_ps), save_ps.width(),
                           save_ps.height());
@@ skipping 47 matching lines @@
 }
 
 ConfirmInfoBarDelegate* SaveCCInfoConfirmInfoBar::GetDelegate() {
   return delegate()->AsConfirmInfoBarDelegate();
 }
 
 InfoBar* CreateAutofillCcInfoBar(ConfirmInfoBarDelegate* delegate) {
   DCHECK(delegate);
   return new SaveCCInfoConfirmInfoBar(delegate);
 }