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

Unified Diff: chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm

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

Patch Set: Removed unnecessary checks, changed declaration 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

« chrome/browser/ui/cocoa/exclusive_access_bubble_window_controller.mm ('K') | « chrome/browser/ui/cocoa/exclusive_access_bubble_window_controller_unittest.mm ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm

diff --git a/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm

index 9651817b430394de539299e78ce83bf4766a0cbb..67e7f25b09ee18fed017a11a83716597a3610c53 100644

--- a/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm

+++ b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm

@@ -444,15 +444,14 @@ class ExtensionLoadedNotificationObserver

IDS_EXTENSION_INSTALLED_SIGNIN_PROMO_LINK));

NSString* message(l10n_util::GetNSStringWithFixup(

IDS_EXTENSION_INSTALLED_SIGNIN_PROMO));

+ message = [link stringByAppendingString:message];

HyperlinkTextView* view = promo_.get();

- [view setMessageAndLink:message

- withLink:link

- atOffset:0

- font:font

- messageColor:[NSColor blackColor]

- linkColor:gfx::SkColorToCalibratedNSColor(

- chrome_style::GetLinkColor())];

+ [view setMessage:message withFont:font messageColor:[NSColor blackColor]];

+ [view addLinkRange:NSMakeRange(0, [link length])

+ withName:@""

+ linkColor:gfx::SkColorToCalibratedNSColor(

+ chrome_style::GetLinkColor())];

Alexei Svitkine (slow) 2015/01/27 19:35:11 Nit: This indent seems wrong. I think it should be

shrike 2015/01/27 19:54:11 You are referring to the chrome_style... line? I c

Alexei Svitkine (slow) 2015/01/27 19:55:41 No, I mean indent less. Align with "gfx::SkColor..

// HACK! The TextView does not report correct height even after you stuff

// it with text (it tells you it is single-line even if it is multiline), so