chrome/browser/ui/cocoa/profiles/profile_signin_confirmation_view_controller.mm - Issue 887823002: Finished swap out of old API

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/cocoa/profiles/profile_signin_confirmation_view_controller.mm

Issue 887823002: Finished swap out of old API (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixed formatting issues, changed code to perform string operations in C++ rather than ObjC 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/profiles/profile_chooser_controller.mm ('k') | chrome/browser/ui/cocoa/tab_contents/sad_tab_view_cocoa.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/profiles/profile_signin_confirmation_view_controller.mm

diff --git a/chrome/browser/ui/cocoa/profiles/profile_signin_confirmation_view_controller.mm b/chrome/browser/ui/cocoa/profiles/profile_signin_confirmation_view_controller.mm

index d9879a495b9324e6c48e50de46d1b5109556f7ec..2af31fd705620cb2382d980bb16b61607a726bec 100644

--- a/chrome/browser/ui/cocoa/profiles/profile_signin_confirmation_view_controller.mm

+++ b/chrome/browser/ui/cocoa/profiles/profile_signin_confirmation_view_controller.mm

@@ -92,12 +92,17 @@ NSTextView* AddTextView(

font_style).GetNativeFont();

NSColor* linkColor = gfx::SkColorToCalibratedNSColor(

chrome_style::GetLinkColor());

- [textView setMessageAndLink:base::SysUTF16ToNSString(message)

- withLink:base::SysUTF16ToNSString(link)

- atOffset:offset

- font:font

- messageColor:[NSColor blackColor]

- linkColor:linkColor];

+ NSMutableString* finalMessage = [NSMutableString stringWithString:

+ base::SysUTF16ToNSString(message)];

+ NSString* linkString = base::SysUTF16ToNSString(link);

+ [finalMessage insertString:linkString atIndex:offset];

+ [textView setMessage:finalMessage

+ withFont:font

+ messageColor:[NSColor blackColor]];

+ [textView addLinkRange:NSMakeRange(offset, [linkString length])

+ withName:@""

+ linkColor:linkColor];

RemoveUnderlining(textView, offset, link.size());

[textView setDelegate:delegate];

[parent addSubview:textView];