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

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

Index: chrome/browser/ui/cocoa/bookmarks/bookmark_sync_promo_controller.mm
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_sync_promo_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_sync_promo_controller.mm
index 1b4249de3ac7eff41ffba0002e4bf32a3d6f0f8f..b3de8c3a14bc2526ca8536a378334bcdbe915b00 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_sync_promo_controller.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_sync_promo_controller.mm
@@ -81,21 +81,21 @@ const int kFontSize = 11;
   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);
   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)];
+  if ([nsLinkText length] != 0) {

[Alexei Svitkine (slow), 2015/01/26 18:11:19]

You don't need this if either.

+    [textView_ addLinkRange:NSMakeRange(offset, [nsLinkText length])
+                   withName:@""
+                  linkColor:linkColor];
+  }
   [textView_ setRefusesFirstResponder:YES];
   [[textView_ textContainer] setLineFragmentPadding:0.0];
   RemoveUnderlining(textView_, offset, linkText.size());