Mac InfoBar: Use cross platform infobar classes

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

 // Copyright 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 "chrome/browser/ui/cocoa/infobars/alternate_nav_infobar_controller.h"
 
 #include "base/logging.h"
 #include "base/strings/sys_string_conversions.h"
 #import "chrome/browser/ui/cocoa/hyperlink_text_view.h"
-#include "chrome/browser/ui/cocoa/infobars/infobar.h"
+#include "chrome/browser/ui/cocoa/infobars/infobar_cocoa.h"
 #include "chrome/browser/ui/omnibox/alternate_nav_infobar_delegate.h"
 #import "ui/base/cocoa/cocoa_event_utils.h"
 #include "ui/base/window_open_disposition.h"
 
 @implementation AlternateNavInfoBarController
 
 // 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];
 
   AlternateNavInfoBarDelegate* delegate =
-      static_cast<AlternateNavInfoBarDelegate*>(delegate_);
+      static_cast<AlternateNavInfoBarDelegate*>([self delegate]);
   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
 // AlternateNavInfoBarController).
 - (void)linkClicked {
   if (![self isOwned])
     return;
   WindowOpenDisposition disposition =
       ui::WindowOpenDispositionFromNSEvent([NSApp currentEvent]);
   AlternateNavInfoBarDelegate* delegate =
-      static_cast<AlternateNavInfoBarDelegate*>(delegate_);
+      static_cast<AlternateNavInfoBarDelegate*>([self delegate]);
   if (delegate->LinkClicked(disposition))
     [self removeSelf];
 }
 
 @end
 
 InfoBar* AlternateNavInfoBarDelegate::CreateInfoBar(InfoBarService* owner) {
-  AlternateNavInfoBarController* controller =
-      [[AlternateNavInfoBarController alloc] initWithDelegate:this owner:owner];
-  return new InfoBar(controller, this);
+  scoped_ptr<InfoBarCocoa> infobar(new InfoBarCocoa(owner, this));

[Robert Sesek, 2013/08/26 14:06:56]

Why keep this in a scoped_ptr<> if you're just going to release it?

[sail, 2013/08/26 18:32:23]

I really like avoiding raw pointers. Similar to using scoped_nsobject and doing
.autorelease at the end.

+  base::scoped_nsobject<AlternateNavInfoBarController> controller(
+      [[AlternateNavInfoBarController alloc] initWithInfoBar:infobar.get()]);
+  infobar->set_controller(controller);
+  return infobar.release();
 }