Use (i) icon and the same tooltip for the credit cards dialog and 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 "chrome/grit/theme_resources.h"
 #include "components/autofill/core/common/password_form.h"
 #include "components/password_manager/core/common/credential_manager_types.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/gfx/color_palette.h"
-#include "ui/gfx/image/image_skia_util_mac.h"
-#include "ui/gfx/paint_vector_icon.h"
-#include "ui/gfx/vector_icons_public.h"
 #include "ui/strings/grit/ui_strings.h"
 
 namespace {
 
 // 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
 
-// An image view that consumes the mouse click.
-@interface InfoImageView : NSImageView
-@end
-
-@implementation InfoImageView
-- (void)mouseDown:(NSEvent*)theEvent {
-  if (theEvent.type != NSLeftMouseDown) {
-    [super mouseDown:theEvent];
-  }
-}
-@end
-
-namespace {
-
-NSImageView* IconForPSL(const NSRect& parentRect, const std::string& tooltip) {
-  NSImage* image = gfx::NSImageFromImageSkia(gfx::CreateVectorIcon(
-      gfx::VectorIconId::INFO_OUTLINE, gfx::kChromeIconGrey));
-  NSRect rect = NSMakeRect(
-      base::i18n::IsRTL() ? kFramePadding
-                          : NSMaxX(parentRect) - kInfoIconSize - kFramePadding,
-      NSMinY(parentRect) + (NSHeight(parentRect) - kInfoIconSize) / 2,
-      kInfoIconSize, kInfoIconSize);
-  base::scoped_nsobject<NSImageView> icon(
-      [[InfoImageView alloc] initWithFrame:rect]);
-  [icon setImage:image];
-  [icon setToolTip:base::SysUTF8ToNSString(tooltip)];
-  return icon.autorelease();
-}
-
-}  // 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;
@@ skipping 15 matching lines @@
 }
 
 - (void)loadView {
   base::scoped_nsobject<NSView> view([[NSView alloc] initWithFrame:NSZeroRect]);
 
   // ------------------------------------
   // |                                  |
   // | Choose an account etc etc        |
   // |                                  |
   // | ----                             |
-  // | |  |  credential view            |
+  // | |  |  credential view       (i)  |
   // | ----                             |
-  // | |  |  credential view            |
+  // | |  |  credential view       (i)  |
   // | ----                             |
   // |                                  |
   // |             [ Cancel ] [Sign In] |
   // ------------------------------------
 
   // Create the views.
   // Title.
   PasswordDialogController* controller = bridge_->GetDialogController();
   std::pair<base::string16, gfx::Range> title_text =
       controller->GetAccoutChooserTitle();
@@ skipping 47 matching lines @@
   const CGFloat buttonWidth = [scrollView contentSize].width;
   CGFloat curY = 0;
   base::scoped_nsobject<NSView> documentView([[NSView alloc]
       initWithFrame:NSZeroRect]);
   for (CredentialItemButton* button in credentialButtons_.get()) {
     [documentView addSubview:button];
     CGFloat cellHeight = [[button cell] cellSize].height;
     [button setFrame:NSMakeRect(0, curY, buttonWidth,
                                 cellHeight + 2 * kVerticalAvatarMargin)];
     if (button.passwordForm->is_public_suffix_match) {
-      NSImageView* icon = IconForPSL(
-          [button frame], button.passwordForm->origin.GetOrigin().spec());
-      [documentView addSubview:icon];
+      NSRect rect = NSMakeRect(
+          base::i18n::IsRTL() ? kFramePadding
+                              : buttonWidth - kInfoIconSize - kFramePadding,
+          (NSHeight([button frame]) - kInfoIconSize) / 2, kInfoIconSize,
+          kInfoIconSize);
+      NSView* icon = [button
+          addInfoIcon:base::SysUTF8ToNSString(
+                          button.passwordForm->origin.GetOrigin().spec())];
+      [icon setFrame:rect];
     }
     curY = NSMaxY([button frame]);
   }
   [documentView setFrameSize:NSMakeSize(buttonWidth, curY)];
   [scrollView setDocumentView:documentView];
   [scrollView setFrameSize:NSMakeSize(
       kDesiredBubbleWidth,
       [scrollView hasVerticalScroller] ? kMaxHeightAccounts * kCredentialHeight
                                        : curY)];
   [view addSubview:scrollView];
@@ skipping 107 matching lines @@
 
 - (NSArray*)credentialButtons {
   return credentialButtons_;
 }
 
 - (NSTextView*)titleView {
   return titleView_;
 }
 
 @end