Add "Sign In" button to 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"
@@ skipping 20 matching lines @@
 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.
+  NSButton* signInButton_;  // Weak.
   NSTextView* titleView_;   //  Weak.
   base::scoped_nsobject<NSArray> credentialButtons_;
   base::scoped_nsobject<AccountAvatarFetcherManager> avatarManager_;
 }
 - (void)onCancelClicked:(id)sender;
 - (void)onCredentialClicked:(id)sender;
+- (void)onSignInClicked:(id)sender;
 - (void)loadCredentialItems;
 @end
 
 @implementation AccountChooserViewController
 @synthesize bridge = bridge_;
 
 - (instancetype)initWithBridge:(PasswordPromptBridgeInterface*)bridge {
   base::scoped_nsobject<AccountAvatarFetcherManager> avatarManager(
       [[AccountAvatarFetcherManager alloc]
            initWithRequestContext:bridge->GetRequestContext()]);
   return [self initWithBridge:bridge avatarManager:avatarManager];
 }
 
+- (NSButton*)defaultButton {
+  return signInButton_;
+}
+
 - (void)loadView {
   base::scoped_nsobject<NSView> view([[NSView alloc] initWithFrame:NSZeroRect]);
 
   // ------------------------------------
   // |                                  |
   // | Choose an account etc etc        |
   // |                                  |
   // | ----                             |
   // | |  |  credential view            |
   // | ----                             |
   // | |  |  credential view            |
   // | ----                             |
   // |                                  |
-  // |                      [ Cancel ]  |
+  // |             [ Cancel ] [Sign In] |
   // ------------------------------------
 
   // Create the views.
   // Title.
+  PasswordDialogController* controller = bridge_->GetDialogController();
   std::pair<base::string16, gfx::Range> title_text =
-      bridge_->GetDialogController()->GetAccoutChooserTitle();
+      controller->GetAccoutChooserTitle();
   titleView_ =
       TitleDialogLabelWithLink(title_text.first, title_text.second, self);
   // Force the text to wrap to fit in the bubble size.
   [titleView_ setVerticallyResizable:YES];
   const CGFloat width = kDesiredBubbleWidth - 2*kFramePadding;
   [titleView_ setFrameSize:NSMakeSize(width, MAXFLOAT)];
   [titleView_ sizeToFit];
   [[titleView_ textContainer] setLineFragmentPadding:0];
   [view addSubview:titleView_];
 
   // Credentials list.
   [self loadCredentialItems];
 
   // "Cancel" button.
-  cancelButton_ = DialogButton(l10n_util::GetNSString(IDS_APP_CANCEL));
+  cancelButton_ = BiggerDialogButton(l10n_util::GetNSString(IDS_APP_CANCEL));
   [cancelButton_ setTarget:self];
   [cancelButton_ setAction:@selector(onCancelClicked:)];
   [cancelButton_ setKeyEquivalent:kKeyEquivalentEscape];
   [view addSubview:cancelButton_];
 
+  // "Sign In" button.
+  if (controller->ShouldShowSignInButton()) {
+    signInButton_ = BiggerDialogButton(
+        l10n_util::GetNSString(IDS_PASSWORD_MANAGER_ACCOUNT_CHOOSER_SIGN_IN));
+    [signInButton_ setTarget:self];
+    [signInButton_ setAction:@selector(onSignInClicked:)];
+    [signInButton_ setKeyEquivalent:kKeyEquivalentReturn];
+    [view addSubview:signInButton_];
+  }
+
   // Lay out the views.
+  CGFloat curX = kFramePadding + width;
+  if (signInButton_) {
+    curX -= NSWidth([signInButton_ frame]);
+    [signInButton_ setFrameOrigin:NSMakePoint(curX, kFramePadding)];
+  }
   [cancelButton_ setFrameOrigin:NSMakePoint(
-      kFramePadding + width - NSWidth([cancelButton_ frame]),
+      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)];
   [scrollView
       setHasVerticalScroller:[credentialButtons_ count] > kMaxHeightAccounts
@@ skipping 39 matching lines @@
 
 - (void)onCredentialClicked:(id)sender {
   CredentialItemButton* button =
       base::mac::ObjCCastStrict<CredentialItemButton>(sender);
   if (bridge_ && bridge_->GetDialogController()) {
     bridge_->GetDialogController()->OnChooseCredentials(*button.passwordForm,
                                                         button.credentialType);
   }
 }
 
+- (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
             backgroundColor:[NSColor textBackgroundColor]
                  hoverColor:skia::SkColorToSRGBNSColor(kButtonHoverColor)]);
@@ skipping 46 matching lines @@
     bridge_ = bridge;
     avatarManager_.reset([avatarManager retain]);
   }
   return self;
 }
 
 - (NSButton*)cancelButton {
   return cancelButton_;
 }
 
+- (NSButton*)signInButton {
+  return signInButton_;
+}
+
 - (NSArray*)credentialButtons {
   return credentialButtons_;
 }
 
 - (NSTextView*)titleView {
   return titleView_;
 }
 
 @end