Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(209)

Unified Diff: chrome/browser/ui/cocoa/one_click_signin_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
Index: chrome/browser/ui/cocoa/one_click_signin_view_controller.mm
diff --git a/chrome/browser/ui/cocoa/one_click_signin_view_controller.mm b/chrome/browser/ui/cocoa/one_click_signin_view_controller.mm
index 26c7c4eb5e68e5ff7c6c18b0e42f4dad80f31022..50e2931b8d6636fc51cb7af8473a81035c36b427 100644
--- a/chrome/browser/ui/cocoa/one_click_signin_view_controller.mm
+++ b/chrome/browser/ui/cocoa/one_click_signin_view_controller.mm
@@ -232,6 +232,7 @@ void ShiftOriginY(NSView* view, CGFloat amount) {
// Set the text.
NSString* learnMoreText = l10n_util::GetNSStringWithFixup(IDS_LEARN_MORE);
NSString* messageText;
+ NSUInteger learnMoreOffset = 0;
ui::ResourceBundle::FontStyle fontStyle = isSyncDialog_ ?
chrome_style::kTextFontStyle : ui::ResourceBundle::SmallFont;
@@ -243,20 +244,21 @@ void ShiftOriginY(NSView* view, CGFloat amount) {
if (isSyncDialog_) {
messageText = l10n_util::GetNSStringFWithFixup(
IDS_ONE_CLICK_SIGNIN_DIALOG_MESSAGE_NEW, email_);
- messageText = [messageText stringByAppendingString:@" "];
+ learnMoreOffset = [messageText length];
+ messageText = [messageText stringByAppendingFormat:@" %@", learnMoreText];
} else {
- messageText = @"";
+ messageText = learnMoreText;
}
NSColor* linkColor =
gfx::SkColorToCalibratedNSColor(chrome_style::GetLinkColor());
- [informativeTextView_ setMessageAndLink:messageText
- withLink:learnMoreText
- atOffset:[messageText length]
- font:font
- messageColor:[NSColor blackColor]
- linkColor:linkColor];
-
+ [informativeTextView_ setMessage:messageText
+ withFont:font
+ messageColor:[NSColor blackColor]];
+ [informativeTextView_ addLinkRange:NSMakeRange(learnMoreOffset,
+ [learnMoreText length])
+ withName:@""
+ linkColor:linkColor];
// Make the "Advanced" link font as large as the "Learn More" link.
[[advancedLink_ cell] setFont:font];

Powered by Google App Engine
This is Rietveld 408576698