Finished swap out of old API

chrome/browser/ui/cocoa/infobars/confirm_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.
 
 #include "chrome/browser/ui/cocoa/infobars/confirm_infobar_controller.h"
 
 #include "base/logging.h"
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/ui/cocoa/infobars/infobar_cocoa.h"
@@ skipping 90 matching lines @@
   }
 
   NSRect frame = [label_.get() frame];
   DCHECK(rightEdge > NSMinX(frame))
       << "Need to make the xib larger to handle buttons with text this long";
   frame.size.width = rightEdge - NSMinX(frame);
   [label_.get() setFrame:frame];
 
   // Set the text and link.
   NSString* message = base::SysUTF16ToNSString(delegate->GetMessageText());
-  base::string16 link = delegate->GetLinkText();
-  if (!link.empty()) {
+  NSString* link = base::SysUTF16ToNSString(delegate->GetLinkText());
+  NSUInteger linkOffset = [message length];
+  NSUInteger linkLength = [link length];
+  if (linkLength != 0) {
     // Add spacing between the label and the link.
-    message = [message stringByAppendingString:@"   "];
+    message = [message stringByAppendingFormat:@"   %@", link];
   }
   NSFont* font = [NSFont labelFontOfSize:
-      [NSFont systemFontSizeForControlSize:NSRegularControlSize]];
+                    [NSFont systemFontSizeForControlSize:NSRegularControlSize]];

[groby-ooo-7-16, 2015/01/30 23:08:39]

I suppose this is "git cl format"'s doing?

[shrike, 2015/02/02 17:39:13]

No - me learning the style guide. Done.

   HyperlinkTextView* view = (HyperlinkTextView*)label_.get();
-  [view setMessageAndLink:message
-                 withLink:base::SysUTF16ToNSString(link)
-                 atOffset:[message length]
-                     font:font
-             messageColor:[NSColor blackColor]
-                linkColor:[NSColor blueColor]];
+  [view setMessage:message withFont:font messageColor:[NSColor blackColor]];
+  if (linkLength != 0) {
+    [view addLinkRange:NSMakeRange(linkOffset, linkLength)
+              withName:@""
+             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]);
   if ([self delegate]->AsConfirmInfoBarDelegate()->LinkClicked(disposition))
     [self removeSelf];
 }
 
 @end
 
 scoped_ptr<infobars::InfoBar> InfoBarService::CreateConfirmInfoBar(
     scoped_ptr<ConfirmInfoBarDelegate> delegate) {
   scoped_ptr<InfoBarCocoa> infobar(new InfoBarCocoa(delegate.Pass()));
   base::scoped_nsobject<ConfirmInfoBarController> controller(
       [[ConfirmInfoBarController alloc] initWithInfoBar:infobar.get()]);
   infobar->set_controller(controller);
   return infobar.Pass();
 }