Eliminate the LinkInfoBar[Delegate] classes entirely.

chrome/browser/ui/cocoa/infobars/infobar_controller.mm

 // 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.
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/logging.h"  // for NOTREACHED()
 #include "base/mac/bundle_locations.h"
 #include "base/mac/mac_util.h"
 #include "base/sys_string_conversions.h"
 #include "grit/ui_resources.h"
 #include "chrome/browser/api/infobars/confirm_infobar_delegate.h"
 #include "chrome/browser/api/infobars/infobar_service.h"
-#include "chrome/browser/api/infobars/link_infobar_delegate.h"
+#include "chrome/browser/infobars/alternate_nav_infobar_delegate.h"
 #import "chrome/browser/ui/cocoa/animatable_view.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #include "chrome/browser/ui/cocoa/event_utils.h"
 #import "chrome/browser/ui/cocoa/hyperlink_text_view.h"
 #import "chrome/browser/ui/cocoa/image_button_cell.h"
 #include "chrome/browser/ui/cocoa/infobars/infobar.h"
 #import "chrome/browser/ui/cocoa/infobars/infobar_container_controller.h"
 #import "chrome/browser/ui/cocoa/infobars/infobar_controller.h"
 #import "chrome/browser/ui/cocoa/infobars/infobar_gradient_view.h"
 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
@@ skipping 255 matching lines @@
   }
 
   LocationBarViewMac* locationBar = [windowController locationBarBridge];
   return locationBar->GetPageInfoBubblePoint();
 }
 
 @end
 
 
 /////////////////////////////////////////////////////////////////////////
-// LinkInfoBarController implementation
+// AlternateNavInfoBarController implementation
 
-@implementation LinkInfoBarController
+@implementation AlternateNavInfoBarController

[Peter Kasting, 2013/01/04 01:09:07]

Nit: Shouldn't all this sort of thing live in a separate
alternate_nav_info_bar_controller.* file, like we do for e.g. extension or
translate infobars?

(Frankly, the confirm one probably should too...)

[tfarina, 2013/01/07 15:31:32]

Hi Peter, I started a new patch to address this.

https://codereview.chromium.org/11773025

 
 // Link infobars have a text message, of which part is linkified.  We
 // use an NSAttributedString to display styled text, and we set a
 // NSLink attribute on the hyperlink portion of the message.  Infobars
 // use a custom NSTextField subclass, which allows us to override
 // textView:clickedOnLink:atIndex: and intercept clicks.
 //
 - (void)addAdditionalControls {
   // No buttons.
   [self removeButtons];
 
-  LinkInfoBarDelegate* delegate = delegate_->AsLinkInfoBarDelegate();
+  AlternateNavInfoBarDelegate* delegate =
+      delegate_->AsAlternateNavInfoBarDelegate();
   DCHECK(delegate);
   size_t offset = string16::npos;
   string16 message = delegate->GetMessageTextWithOffset(&offset);
   string16 link = delegate->GetLinkText();
   NSFont* font = [NSFont labelFontOfSize:
                   [NSFont systemFontSizeForControlSize:NSRegularControlSize]];
   HyperlinkTextView* view = (HyperlinkTextView*)label_.get();
   [view setMessageAndLink:base::SysUTF16ToNSString(message)
                  withLink:base::SysUTF16ToNSString(link)
                  atOffset:offset
                      font:font
              messageColor:[NSColor blackColor]
                 linkColor:[NSColor blueColor]];
 }
 
 // Called when someone clicks on the link in the infobar.  This method
 // is called by the InfobarTextField on its delegate (the
-// LinkInfoBarController).
+// AlternateNavInfoBarController).
 - (void)linkClicked {
   if (![self isOwned])
     return;
   WindowOpenDisposition disposition =
       event_utils::WindowOpenDispositionFromNSEvent([NSApp currentEvent]);
-  if (delegate_->AsLinkInfoBarDelegate()->LinkClicked(disposition))
+  if (delegate_->AsAlternateNavInfoBarDelegate()->LinkClicked(disposition))
     [self removeSelf];
 }
 
 @end
 
 
 /////////////////////////////////////////////////////////////////////////
 // ConfirmInfoBarController implementation
 
 @implementation ConfirmInfoBarController
@@ skipping 100 matching lines @@
   [view setMessageAndLink:message
                  withLink:base::SysUTF16ToNSString(link)
                  atOffset:[message length]
                      font:font
              messageColor:[NSColor blackColor]
                 linkColor:[NSColor blueColor]];
 }
 
 // Called when someone clicks on the link in the infobar.  This method
 // is called by the InfobarTextField on its delegate (the
-// LinkInfoBarController).
+// AlternateNavInfoBarController).
 - (void)linkClicked {
   if (![self isOwned])
     return;
   WindowOpenDisposition disposition =
       event_utils::WindowOpenDispositionFromNSEvent([NSApp currentEvent]);
   if (delegate_->AsConfirmInfoBarDelegate()->LinkClicked(disposition))
     [self removeSelf];
 }
 
 @end
 
 
 //////////////////////////////////////////////////////////////////////////
 // CreateInfoBar() implementations
 
-InfoBar* LinkInfoBarDelegate::CreateInfoBar(InfoBarService* owner) {
-  LinkInfoBarController* controller =
-      [[LinkInfoBarController alloc] initWithDelegate:this owner:owner];
+InfoBar* AlternateNavInfoBarDelegate::CreateInfoBar(InfoBarService* owner) {
+  AlternateNavInfoBarController* controller =
+      [[AlternateNavInfoBarController alloc] initWithDelegate:this owner:owner];
   return new InfoBar(controller, this);
 }
 
 InfoBar* ConfirmInfoBarDelegate::CreateInfoBar(InfoBarService* owner) {
   ConfirmInfoBarController* controller =
       [[ConfirmInfoBarController alloc] initWithDelegate:this owner:owner];
   return new InfoBar(controller, this);
 }