Eliminate the LinkInfoBar[Delegate] classes entirely.

chrome/browser/ui/views/infobars/alternate_nav_infobar_view.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/link_infobar.h"
+#include "chrome/browser/ui/views/infobars/alternate_nav_infobar_view.h"
 
 #include "base/logging.h"
-#include "chrome/browser/api/infobars/link_infobar_delegate.h"
 #include "chrome/browser/event_disposition.h"
+#include "chrome/browser/infobars/alternate_nav_infobar_delegate.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/link.h"
 
-// LinkInfoBarDelegate --------------------------------------------------------
+// AlternateNavInfoBarDelegate -------------------------------------------------
 
-InfoBar* LinkInfoBarDelegate::CreateInfoBar(InfoBarService* owner) {
-  return new LinkInfoBar(owner, this);
+InfoBar* AlternateNavInfoBarDelegate::CreateInfoBar(InfoBarService* owner) {
+  return new AlternateNavInfoBarView(owner, this);
 }
 
-// LinkInfoBar ----------------------------------------------------------------
+// AlternateNavInfoBarView -----------------------------------------------------
 
-LinkInfoBar::LinkInfoBar(InfoBarService* owner,
-                         LinkInfoBarDelegate* delegate)
+AlternateNavInfoBarView::AlternateNavInfoBarView(
+    InfoBarService* owner,
+    AlternateNavInfoBarDelegate* delegate)
     : InfoBarView(owner, delegate),
       label_1_(NULL),
       link_(NULL),
       label_2_(NULL) {
 }
 
-LinkInfoBar::~LinkInfoBar() {
+AlternateNavInfoBarView::~AlternateNavInfoBarView() {
 }
 
-void LinkInfoBar::Layout() {
+void AlternateNavInfoBarView::Layout() {
   InfoBarView::Layout();
 
   // TODO(pkasting): This isn't perfect; there are points when we should elide a
   // view because its subsequent view will be too small to show an ellipsis.
   gfx::Size label_1_size = label_1_->GetPreferredSize();
   int available_width = EndX() - StartX();
   label_1_->SetBounds(StartX(), OffsetY(label_1_size),
       std::min(label_1_size.width(), available_width), label_1_size.height());
   available_width = std::max(0, available_width - label_1_size.width());
 
   gfx::Size link_size = link_->GetPreferredSize();
   link_->SetBounds(label_1_->bounds().right(), OffsetY(link_size),
       std::min(link_size.width(), available_width), link_size.height());
   available_width = std::max(0, available_width - link_size.width());
 
   gfx::Size label_2_size = label_2_->GetPreferredSize();
   label_2_->SetBounds(link_->bounds().right(), OffsetY(label_2_size),
       std::min(label_2_size.width(), available_width), label_2_size.height());
 }
 
-void LinkInfoBar::ViewHierarchyChanged(bool is_add, View* parent, View* child) {
+void AlternateNavInfoBarView::ViewHierarchyChanged(bool is_add,
+                                                   View* parent,
+                                                   View* child) {
   if (is_add && (child == this) && (label_1_ == NULL)) {
-    LinkInfoBarDelegate* delegate = GetDelegate();
+    AlternateNavInfoBarDelegate* delegate = GetDelegate();
     size_t offset;
     string16 message_text = delegate->GetMessageTextWithOffset(&offset);
     DCHECK_NE(string16::npos, offset);
     label_1_ = CreateLabel(message_text.substr(0, offset));
     AddChildView(label_1_);
 
     link_ = CreateLink(delegate->GetLinkText(), this);
     AddChildView(link_);
 
     label_2_ = CreateLabel(message_text.substr(offset));
     AddChildView(label_2_);
   }
 
   // This must happen after adding all other children so InfoBarView can ensure
   // the close button is the last child.
   InfoBarView::ViewHierarchyChanged(is_add, parent, child);
 }
 
-void LinkInfoBar::LinkClicked(views::Link* source, int event_flags) {
+void AlternateNavInfoBarView::LinkClicked(views::Link* source,
+                                          int event_flags) {
   if (!owned())
     return;  // We're closing; don't call anything, it might access the owner.
   DCHECK(link_ != NULL);
   DCHECK_EQ(link_, source);
   if (GetDelegate()->LinkClicked(
       chrome::DispositionFromEventFlags(event_flags)))
     RemoveSelf();
 }
 
-LinkInfoBarDelegate* LinkInfoBar::GetDelegate() {
-  return delegate()->AsLinkInfoBarDelegate();
+AlternateNavInfoBarDelegate* AlternateNavInfoBarView::GetDelegate() {
+  return delegate()->AsAlternateNavInfoBarDelegate();
 }