Removed calls to [HyperlinkTextView setMessageAndLink:withLink:...]

chrome/browser/ui/cocoa/bookmarks/bookmark_sync_promo_controller.mm

 // Copyright 2013 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/bookmarks/bookmark_sync_promo_controller.h"
 
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/browser/signin/signin_promo.h"
 #include "chrome/browser/ui/chrome_pages.h"
 #include "chrome/browser/ui/chrome_style.h"
@@ skipping 63 matching lines @@
   [promoView setBorderWidth:kBorderWidth];
   [promoView setBorderColor:gfx::SkColorToDeviceNSColor(kBorderColor)];
 
   // Add the sync promo text.
   size_t offset;
   const base::string16 linkText = l10n_util::GetStringUTF16(
       IDS_BOOKMARK_SYNC_PROMO_LINK);
   const base::string16 promoText =  l10n_util::GetStringFUTF16(
       IDS_BOOKMARK_SYNC_PROMO_MESSAGE,
       linkText, &offset);
-  const base::string16 promoTextWithoutLink =
-      promoText.substr(0, offset) +
-      promoText.substr(offset + linkText.size());
-
+  NSString* nsPromoText = SysUTF16ToNSString(promoText);
+  NSString* nsLinkText = SysUTF16ToNSString(linkText);

[Alexei Svitkine (slow), 2015/01/28 14:55:03]

Use GetNSStringWithFixup instead of first getting the string16 and then
converting it yourself for both of these.

[shrike, 2015/01/28 17:35:04]

That's a handy function, but the promoText =  l10n_util::GetStringFUTF16() call
also replaces a placeholder string sequence with linkText, and linkText has to
be passed in as a base::string16. The call to GetNSStringWithFixup does some
fixup on the string, but I don't see a version that also replaces placeholder
string sequences?

[Alexei Svitkine (slow), 2015/01/28 17:36:58]

Actually, I think the *Fixup variants aren't needed here - so you should be able
to use GetNSString() and GetNSStringF() for the formatting.

   NSFont* font = [NSFont labelFontOfSize:kFontSize];
   NSColor* linkColor = gfx::SkColorToCalibratedNSColor(
       chrome_style::GetLinkColor());
 
   textView_.reset([[HyperlinkTextView alloc] init]);
-  [textView_ setMessageAndLink:base::SysUTF16ToNSString(promoTextWithoutLink)
-                      withLink:base::SysUTF16ToNSString(linkText)
-                      atOffset:offset
-                          font:font
-                  messageColor:gfx::SkColorToDeviceNSColor(kTextColor)
-                     linkColor:linkColor];
+  [textView_ setMessage:nsPromoText
+               withFont:font
+           messageColor:gfx::SkColorToDeviceNSColor(kTextColor)];
+  [textView_ addLinkRange:NSMakeRange(offset, [nsLinkText length])
+                 withName:@""
+                linkColor:linkColor];
   [textView_ setRefusesFirstResponder:YES];
   [[textView_ textContainer] setLineFragmentPadding:0.0];
   RemoveUnderlining(textView_, offset, linkText.size());
   [textView_ setDelegate:self];
 
   [promoView setContentView:textView_];
 
   [self setView:promoView];
 }
 
 - (BOOL)textView:(NSTextView *)textView
    clickedOnLink:(id)link
          atIndex:(NSUInteger)charIndex {
   chrome::ShowBrowserSignin(browser_, signin_metrics::SOURCE_BOOKMARK_BUBBLE);
   return YES;
 }
 
 @end