chrome/browser/ui/cocoa/exclusive_access_bubble_window_controller.mm - Issue 865373002: Removed calls to [HyperlinkTextView setMessageAndLink:withLink:...]

Unified Diff: chrome/browser/ui/cocoa/exclusive_access_bubble_window_controller.mm

Issue 865373002: Removed calls to [HyperlinkTextView setMessageAndLink:withLink:...] (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/cocoa/bookmarks/bookmark_sync_promo_controller.mm ('k') | chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm » ('j') | chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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..63209a5ef67b180a2862ee5bf1bd003ff1c194f9 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,36 @@ 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(

+ 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]];

+ [(HyperlinkTextView*)exitLabel_.get() setMessage:exitLinkedText

+ withFont:font

+ messageColor:[NSColor blackColor]];

+ if ([exitLinkText length] != 0) {

+ [(HyperlinkTextView*)exitLabel_.get()

Alexei Svitkine (slow) 2015/01/23 19:14:18 Can the type of exitLabel be changed to the smart

+ addLinkRange:NSMakeRange(0, [exitLinkText length])

+ withName:@""

+ linkColor:[NSColor blueColor]];

+ }

[exitLabel_.get() setAlignment:NSRightTextAlignment];

NSRect labelFrame = [exitLabel_ frame];