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

chrome/browser/ui/cocoa/exclusive_access_bubble_window_controller.mm

 // Copyright (c) 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 <Cocoa/Cocoa.h>
 
 #include "base/logging.h"  // for NOTREACHED()
 #include "base/mac/bundle_locations.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 195 matching lines @@
       initWithFrame:[exitLabelPlaceholder_ frame]]);
   [exitLabel_.get()
       setAutoresizingMask:[exitLabelPlaceholder_ autoresizingMask]];
   [exitLabel_.get() setHidden:[exitLabelPlaceholder_ isHidden]];
   [[exitLabelPlaceholder_ superview] replaceSubview:exitLabelPlaceholder_
                                                with:exitLabel_.get()];
   exitLabelPlaceholder_ = nil;  // Now released.
   [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];
 
   // NSTextView's sizeToFit: method seems to enjoy wrapping lines. Temporarily
   // set the size large to force it not to.
   NSRect windowFrame = [[self window] frame];
   [exitLabel_ setFrameSize:windowFrame.size];
   NSLayoutManager* layoutManager = [exitLabel_ layoutManager];
   NSTextContainer* textContainer = [exitLabel_ textContainer];
@@ skipping 69 matching lines @@
 - (void)hideSoon {
   hideTimer_.reset(
       [[NSTimer scheduledTimerWithTimeInterval:kInitialDelay
                                         target:self
                                       selector:@selector(hideTimerFired:)
                                       userInfo:nil
                                        repeats:NO] retain]);
 }
 
 @end