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

chrome/browser/ui/cocoa/exclusive_access_bubble_window_controller.mm

Index: chrome/browser/ui/cocoa/exclusive_access_bubble_window_controller.mm
diff --git a/chrome/browser/ui/cocoa/exclusive_access_bubble_window_controller.mm b/chrome/browser/ui/cocoa/exclusive_access_bubble_window_controller.mm
index d6c0de1689d19206affeb70769be10d861a2380a..484490c367a5f092bf6a89089669ed2a900d7df4 100644
--- a/chrome/browser/ui/cocoa/exclusive_access_bubble_window_controller.mm
+++ b/chrome/browser/ui/cocoa/exclusive_access_bubble_window_controller.mm
@@ -213,34 +213,35 @@ const float kHideDuration = 0.7;
   [exitLabel_.get() setDelegate:self];
 
   NSString* exitLinkText;
-  NSString* exitUnlinkedText;
+  NSString* exitLinkedText;
   if (bubbleType_ ==
           EXCLUSIVE_ACCESS_BUBBLE_TYPE_FULLSCREEN_MOUSELOCK_EXIT_INSTRUCTION ||
       bubbleType_ == EXCLUSIVE_ACCESS_BUBBLE_TYPE_MOUSELOCK_EXIT_INSTRUCTION) {
     exitLinkText = @"";
-    exitUnlinkedText =
+    exitLinkedText =
         [@" " stringByAppendingString:l10n_util::GetNSStringF(
                                           IDS_FULLSCREEN_PRESS_ESC_TO_EXIT,
                                           l10n_util::GetStringUTF16(
                                               IDS_APP_ESC_KEY))];
   } else {
     exitLinkText = l10n_util::GetNSString(IDS_EXIT_FULLSCREEN_MODE);
-    exitUnlinkedText =
-        [@" " stringByAppendingString:l10n_util::GetNSStringF(
-                                          IDS_EXIT_FULLSCREEN_MODE_ACCELERATOR,
-                                          l10n_util::GetStringUTF16(
-                                              IDS_APP_ESC_KEY))];
+    exitLinkedText = [NSString stringWithFormat:@"%@ %@", exitLinkText,
+                            l10n_util::GetNSStringF(

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

Please make a local var for this part.

+                                  IDS_EXIT_FULLSCREEN_MODE_ACCELERATOR,
+                                  l10n_util::GetStringUTF16(IDS_APP_ESC_KEY))];
   }
 
   NSFont* font = [NSFont
       systemFontOfSize:[NSFont
                            systemFontSizeForControlSize:NSRegularControlSize]];
-  [(HyperlinkTextView*)exitLabel_.get() setMessageAndLink:exitUnlinkedText
-                                                 withLink:exitLinkText
-                                                 atOffset:0
-                                                     font:font
-                                             messageColor:[NSColor blackColor]
-                                                linkColor:[NSColor blueColor]];
+  [exitLabel_.get() setMessage:exitLinkedText
+                      withFont:font
+                  messageColor:[NSColor blackColor]];
+  if ([exitLinkText length] != 0) {

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

No if?

+    [exitLabel_.get() addLinkRange:NSMakeRange(0, [exitLinkText length])
+                          withName:@""
+                         linkColor:[NSColor blueColor]];
+  }
   [exitLabel_.get() setAlignment:NSRightTextAlignment];
 
   NSRect labelFrame = [exitLabel_ frame];