[Mac] Password generation: Make "saved passwords" a hyperlink.

chrome/browser/ui/cocoa/autofill/password_generation_popup_view_cocoa.mm

 // Copyright 2014 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 "chrome/browser/ui/cocoa/autofill/password_generation_popup_view_cocoa.h"
 
 #include "base/logging.h"
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/browser/ui/autofill/autofill_popup_controller.h"
 #include "chrome/browser/ui/autofill/autofill_popup_view.h"
 #include "chrome/browser/ui/autofill/popup_constants.h"
 #include "chrome/browser/ui/cocoa/autofill/password_generation_popup_view_bridge.h"
+#import "chrome/browser/ui/cocoa/hyperlink_text_view.h"
 #import "chrome/browser/ui/cocoa/l10n_util.h"
 #include "components/autofill/core/browser/popup_item_ids.h"
 #include "grit/ui_resources.h"
 #include "skia/ext/skia_utils_mac.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/font_list.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/point.h"
+#include "ui/gfx/range/range.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/text_constants.h"
 
 using autofill::AutofillPopupView;
 using autofill::PasswordGenerationPopupView;
 using base::scoped_nsobject;
 
 namespace {
 
 NSColor* DividerColor() {
@@ skipping 20 matching lines @@
 - (id)initWithFrame:(NSRect)frame {
   NOTREACHED();
   return nil;
 }
 
 - (id)initWithController:
     (autofill::PasswordGenerationPopupController*)controller
                    frame:(NSRect)frame {
   if (self = [super initWithDelegate:controller frame:frame]) {
     controller_ = controller;
-    NSFont* font = controller_->font_list().GetPrimaryFont().GetNativeFont();
 
     passwordField_ = [self textFieldWithText:controller_->password()
-                                    withFont:font
                                        color:[self nameColor]
                                    alignment:NSLeftTextAlignment];
     [self addSubview:passwordField_];
 
-    passwordSubtextField_ =
-        [self textFieldWithText:controller_->SuggestedText()
-                       withFont:font
-                          color:[self subtextColor]
-                      alignment:NSRightTextAlignment];
+    passwordSubtextField_ = [self textFieldWithText:controller_->SuggestedText()
+                                              color:[self subtextColor]
+                                          alignment:NSRightTextAlignment];
     [self addSubview:passwordSubtextField_];
 
-    helpTextField_ = [self textFieldWithText:controller_->HelpText()
-                                    withFont:font
-                                       color:HelpTextColor()
-                                   alignment:NSLeftTextAlignment];
-    [self addSubview:helpTextField_];
+    scoped_nsobject<HyperlinkTextView> helpTextView(
+        [[HyperlinkTextView alloc] initWithFrame:NSZeroRect]);
+    [helpTextView setMessage:base::SysUTF16ToNSString(controller_->HelpText())
+                    withFont:[self textFont]
+                messageColor:HelpTextColor()];
+    [helpTextView addLinkRange:controller_->HelpTextLinkRange().ToNSRange()
+                      withName:@""
+                     linkColor:[NSColor blueColor]];

[groby-ooo-7-16, 2014/06/04 18:39:56]

nit: You might want to get link color via
gfx::SkColorToCalibratedNSColor(chrome_style::GetLinkColor())

[Patrick Dubroy, 2014/06/17 13:47:21]

Done.

+    [helpTextView setDelegate:self];
+    [[helpTextView textContainer] setLineFragmentPadding:0.0f];
+    [helpTextView setVerticallyResizable:YES];
+    [self addSubview:helpTextView];
+    helpTextView_ = helpTextView.get();
   }
 
   return self;
 }
 
 #pragma mark NSView implementation:
 
 - (void)drawRect:(NSRect)dirtyRect {
   // If the view is in the process of being destroyed, don't bother drawing.
   if (!controller_)
@@ skipping 17 matching lines @@
   [NSBezierPath fillRect:[self helpBounds]];
 
   // Render the divider.
   [DividerColor() set];
   [NSBezierPath fillRect:[self dividerBounds]];
 }
 
 #pragma mark Public API:
 
 - (void)updateBoundsAndRedrawPopup {
-  [self positionTextField:passwordField_ inRect:[self passwordBounds]];
-  [self positionTextField:passwordSubtextField_ inRect:[self passwordBounds]];
-  [self positionTextField:helpTextField_ inRect:[self helpBounds]];
+  [self positionView:passwordField_ inRect:[self passwordBounds]];
+  [self positionView:passwordSubtextField_ inRect:[self passwordBounds]];
+  [self positionView:helpTextView_ inRect:[self helpBounds]];
 
   [super updateBoundsAndRedrawPopup];
 }
 
 - (void)controllerDestroyed {
   controller_ = NULL;
   [super delegateDestroyed];
 }
 
+#pragma mark NSTextViewDelegate implementation:
+
+- (BOOL)textView:(NSTextView *)textView

[groby-ooo-7-16, 2014/06/04 18:39:56]

NSTextView* - remove space

[Patrick Dubroy, 2014/06/17 13:47:20]

Done.

+   clickedOnLink:(id)link
+         atIndex:(NSUInteger)charIndex {

[groby-ooo-7-16, 2014/06/04 18:39:56]

if (controller_)?

I don't _think_ this case can happen, but that relies on other classes doing the
right thing.

[Patrick Dubroy, 2014/06/17 13:47:21]

If it's ok with you, I'd rather not put the check in. It should not be possible,
and if it is, we should crash rather than silently do nothing.

+  controller_->OnSavedPasswordsLinkClicked();
+  return YES;
+}
+
 #pragma mark Private helpers:
 
 - (NSTextField*)textFieldWithText:(const base::string16&)text
-                         withFont:(NSFont*)font
                             color:(NSColor*)color
                         alignment:(NSTextAlignment)alignment {
   scoped_nsobject<NSMutableParagraphStyle> paragraphStyle(
       [[NSMutableParagraphStyle alloc] init]);
   [paragraphStyle setAlignment:alignment];
 
   NSDictionary* textAttributes = @{
-    NSFontAttributeName : font,
+    NSFontAttributeName : [self textFont],
     NSForegroundColorAttributeName : color,
     NSParagraphStyleAttributeName : paragraphStyle
   };
 
   scoped_nsobject<NSAttributedString> attributedString(
       [[NSAttributedString alloc]
           initWithString:base::SysUTF16ToNSString(text)
               attributes:textAttributes]);
 
   NSTextField* textField =
       [[[NSTextField alloc] initWithFrame:NSZeroRect] autorelease];
   [textField setAttributedStringValue:attributedString];
   [textField setEditable:NO];
   [textField setSelectable:NO];
   [textField setDrawsBackground:NO];
   [textField setBezeled:NO];
-
   return textField;
 }
 
-- (void)positionTextField:(NSTextField*)textField inRect:(NSRect)bounds {
+- (void)positionView:(NSView*)view inRect:(NSRect)bounds {
   NSRect frame = NSInsetRect(bounds, controller_->kHorizontalPadding, 0);
-  [textField setFrame:frame];
+  [view setFrame:frame];
 
   // Center the text vertically within the bounds.
-  NSSize delta = cocoa_l10n_util::WrapOrSizeToFit(textField);
-  [textField setFrameOrigin:
+  NSSize delta = cocoa_l10n_util::WrapOrSizeToFit(view);
+  [view setFrameOrigin:
       NSInsetRect(frame, 0, floor(-delta.height/2)).origin];
 }
 
 - (NSRect)passwordBounds {
   return NSRectFromCGRect(controller_->password_bounds().ToCGRect());
 }
 
 - (NSRect)helpBounds {
   return NSRectFromCGRect(controller_->help_bounds().ToCGRect());
 }
 
 - (NSRect)dividerBounds {
   return NSRectFromCGRect(controller_->divider_bounds().ToCGRect());
 }
 
+- (NSFont*)textFont {
+  return controller_->font_list().GetPrimaryFont().GetNativeFont();
+}
+
 @end