Show 3 rows in the account chooser.

chrome/browser/ui/passwords/manage_passwords_view_utils.cc

 // 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.
 
 #include "chrome/browser/ui/passwords/manage_passwords_view_utils.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 
@@ skipping 37 matching lines @@
     skia_image = gfx::ImageSkiaOperations::ExtractSubset(skia_image, target);
   }
   return gfx::ImageSkiaOperations::CreateResizedImage(
       skia_image,
       skia::ImageOperations::RESIZE_BEST,
       gfx::Size(kAvatarImageSize, kAvatarImageSize));
 }
 
 std::pair<base::string16, base::string16> GetCredentialLabelsForAccountChooser(
     const autofill::PasswordForm& form) {
-  const base::string16& upper_string =
-      form.display_name.empty() ? form.username_value : form.display_name;
-  base::string16 lower_string;
-  if (form.federation_origin.unique()) {
-    if (!form.display_name.empty())
-      lower_string = form.username_value;
-  } else {
-    lower_string = l10n_util::GetStringFUTF16(
+  base::string16 federation;
+  if (!form.federation_origin.unique()) {
+    federation = l10n_util::GetStringFUTF16(
         IDS_PASSWORDS_VIA_FEDERATION,
         base::UTF8ToUTF16(form.federation_origin.host()));
   }
-  return std::make_pair(upper_string, lower_string);
+
+  if (form.display_name.empty())
+    return std::make_pair(form.username_value, std::move(federation));
+
+  // Display name isn't empty.
+  if (federation.empty())
+    return std::make_pair(form.display_name, form.username_value);
+
+  return std::make_pair(
+      form.display_name,
+      form.username_value + base::ASCIIToUTF16("\n") + federation);
 }
 
 void GetSavePasswordDialogTitleTextAndLinkRange(
     const GURL& user_visible_url,
     const GURL& form_origin_url,
     bool is_smartlock_branding_enabled,
     PasswordTittleType dialog_type,
     base::string16* title,
     gfx::Range* title_link_range) {
   DCHECK(!password_manager::IsValidAndroidFacetURI(form_origin_url.spec()));
@@ skipping 97 matching lines @@
              : form.username_value;
 }
 
 bool IsSyncingAutosignSetting(Profile* profile) {
   const ProfileSyncService* sync_service =
       ProfileSyncServiceFactory::GetForProfile(profile);
   return (sync_service && sync_service->IsFirstSetupComplete() &&
           sync_service->IsSyncActive() &&
           sync_service->GetActiveDataTypes().Has(syncer::PRIORITY_PREFERENCES));
 }