Tune the account chooser on Mac.

chrome/browser/ui/cocoa/passwords/account_chooser_view_controller.mm

 // Copyright 2015 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/passwords/account_chooser_view_controller.h"
 
 #include "base/mac/foundation_util.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #import "chrome/browser/ui/cocoa/key_equivalent_constants.h"
 #import "chrome/browser/ui/cocoa/passwords/account_avatar_fetcher_manager.h"
 #import "chrome/browser/ui/cocoa/passwords/credential_item_button.h"
 #import "chrome/browser/ui/cocoa/passwords/passwords_bubble_utils.h"
 #include "chrome/browser/ui/passwords/manage_passwords_view_utils.h"
 #include "chrome/browser/ui/passwords/password_dialog_controller.h"
 #include "chrome/browser/ui/passwords/password_dialog_prompts.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/autofill/core/common/password_form.h"
 #include "components/password_manager/core/common/credential_manager_types.h"
 #include "grit/theme_resources.h"
 #include "skia/ext/skia_utils_mac.h"
 #include "ui/base/cocoa/controls/hyperlink_text_view.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/strings/grit/ui_strings.h"
 
 namespace {
 
-// Returns height of one credential item.
+// Standard height of one credential item. It can be bigger though in case the
+// text needs more vertical space than the avatar.
 constexpr CGFloat kCredentialHeight =
     kAvatarImageSize + 2 * kVerticalAvatarMargin;
 
 // Maximum height of the credential list. The unit is one row height.
 constexpr CGFloat kMaxHeightAccounts = 3.5;
 
 }  // namespace
 
 @interface AccountChooserViewController () {
   NSButton* cancelButton_;  // Weak.
@@ skipping 76 matching lines @@
   // Lay out the views.
   CGFloat curX = kFramePadding + width;
   if (signInButton_) {
     curX -= NSWidth([signInButton_ frame]);
     [signInButton_ setFrameOrigin:NSMakePoint(curX, kFramePadding)];
   }
   [cancelButton_ setFrameOrigin:NSMakePoint(
       curX - NSWidth([cancelButton_ frame]),
       kFramePadding)];
 
-  NSSize buttonsSize = NSMakeSize(
-      kDesiredBubbleWidth,
-      std::min<CGFloat>([credentialButtons_ count], kMaxHeightAccounts) *
-          kCredentialHeight);
   base::scoped_nsobject<NSScrollView> scrollView([[NSScrollView alloc]
-      initWithFrame:NSMakeRect(0, 0, buttonsSize.width, buttonsSize.height)]);
+      initWithFrame:NSMakeRect(0, 0, kDesiredBubbleWidth, kCredentialHeight)]);
   [scrollView
       setHasVerticalScroller:[credentialButtons_ count] > kMaxHeightAccounts
                                  ? YES
                                  : NO];
   [scrollView setBorderType:NSNoBorder];
-  CGFloat buttonWidth = [scrollView contentSize].width;
+  const CGFloat buttonWidth = [scrollView contentSize].width;
   CGFloat curY = 0;
   base::scoped_nsobject<NSView> documentView([[NSView alloc]
-      initWithFrame:NSMakeRect(0, 0, buttonWidth, [credentialButtons_ count] *
-                                                      kCredentialHeight)]);
+      initWithFrame:NSZeroRect]);
   for (CredentialItemButton* button in credentialButtons_.get()) {
     [documentView addSubview:button];
-    [button setFrame:NSMakeRect(0, curY, buttonWidth, kCredentialHeight)];
+    CGFloat cellHeight = [[button cell] cellSize].height;
+    [button setFrame:NSMakeRect(0, curY, buttonWidth,
+                                cellHeight + 2 * kVerticalAvatarMargin)];
     curY = NSMaxY([button frame]);
   }
+  [documentView setFrameSize:NSMakeSize(buttonWidth, curY)];
   [scrollView setDocumentView:documentView];
+  [scrollView setFrameSize:NSMakeSize(
+      kDesiredBubbleWidth,
+      [scrollView hasVerticalScroller] ? kMaxHeightAccounts * kCredentialHeight
+                                       : curY)];
   [view addSubview:scrollView];
   [documentView scrollRectToVisible:NSMakeRect(0, curY, buttonWidth, 0)];
   curY = NSMaxY([cancelButton_ frame]) + 3 * kRelatedControlVerticalSpacing;
   [scrollView setFrameOrigin:NSMakePoint(0, curY)];
   curY = NSMaxY([scrollView frame]) + 2 * kRelatedControlVerticalSpacing;
 
   [titleView_ setFrameOrigin:NSMakePoint(kFramePadding, curY)];
 
   const CGFloat frameHeight = NSMaxY([titleView_ frame]) + kFramePadding;
   [view setFrame:NSMakeRect(0, 0, kDesiredBubbleWidth, frameHeight)];
@@ skipping 23 matching lines @@
 }
 
 - (void)onSignInClicked:(id)sender {
   if (bridge_ && bridge_->GetDialogController())
     bridge_->GetDialogController()->OnSignInClicked();
 }
 
 - (void)loadCredentialItems {
   base::scoped_nsobject<NSMutableArray> items([[NSMutableArray alloc] init]);
   PasswordDialogController* controller = self.bridge->GetDialogController();
-  NSRect rect = NSMakeRect(0, 0, kDesiredBubbleWidth, kCredentialHeight);
   for (const auto& form : controller->GetLocalForms()) {
     base::scoped_nsobject<CredentialItemButton> item(
         [[CredentialItemButton alloc]
-              initWithFrame:rect
+              initWithFrame:NSZeroRect
             backgroundColor:[NSColor textBackgroundColor]
                  hoverColor:skia::SkColorToSRGBNSColor(kButtonHoverColor)]);
     [item setPasswordForm:form.get()];
     [item setCredentialType:password_manager::CredentialType::
                                 CREDENTIAL_TYPE_PASSWORD];
     std::pair<base::string16, base::string16> labels =
         GetCredentialLabelsForAccountChooser(*form);
     if (labels.second.empty()) {
       [item setTitle:base::SysUTF16ToNSString(labels.first)];
     } else {
@@ skipping 51 matching lines @@
 
 - (NSArray*)credentialButtons {
   return credentialButtons_;
 }
 
 - (NSTextView*)titleView {
   return titleView_;
 }
 
 @end