[MD User Menu] Un-hardcode profile card's spacing

chrome/browser/ui/views/profiles/profile_chooser_view.cc

 // 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.
 
 #include "chrome/browser/ui/views/profiles/profile_chooser_view.h"
 
 #include "base/macros.h"
 #include "base/metrics/user_metrics.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 1688 matching lines @@
 
   // Profile name, left-aligned to the right of profile icon.
   views::Label* current_profile_name = new views::Label(
       profiles::GetAvatarNameForProfile(browser_->profile()->GetPath()));
   current_profile_name->SetFontList(
       ui::ResourceBundle::GetSharedInstance().GetFontListWithDelta(
           1, gfx::Font::FontStyle::NORMAL, gfx::Font::Weight::MEDIUM));
   current_profile_name->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   NonInteractiveContainer* profile_name_container =
       new NonInteractiveContainer();
-  int name_container_v_spacing = views::kRelatedControlVerticalSpacing;
-  if (!avatar_item.signed_in || switches::IsEnableAccountConsistency())
-    name_container_v_spacing += views::kRelatedControlVerticalSpacing;
-  profile_name_container->SetLayoutManager(new views::BoxLayout(
-      views::BoxLayout::kVertical, 0, name_container_v_spacing, 0));
+  int name_container_v_spacing =
+      (current_profile_photo->GetPreferredSize().height() -
+       current_profile_name->GetPreferredSize().height()) / 2;
+  views::BoxLayout* profile_name_layout = new views::BoxLayout(
+      views::BoxLayout::kVertical, 0, name_container_v_spacing, 0);
+  profile_name_container->SetLayoutManager(profile_name_layout);
   profile_name_container->AddChildView(current_profile_name);
 
   const int between_child_spacing =
       kMaterialMenuEdgeMargin - EditableProfilePhoto::badge_spacing();
   current_profile_card_->SetLayoutManager(new views::BoxLayout(
       views::BoxLayout::kHorizontal, 0,
       views::kRelatedControlSmallVerticalSpacing, between_child_spacing));
   current_profile_card_->AddChildView(current_profile_photo);
   current_profile_card_->AddChildView(profile_name_container);
   current_profile_card_->SetMinSize(gfx::Size(
@@ skipping 17 matching lines @@
           new BackgroundColorHoverButton(this, button_text);
       manage_accounts_button_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
       manage_accounts_button_->SetMinSize(
           gfx::Size(GetFixedMenuWidth(), kButtonHeight));
       view->AddChildView(manage_accounts_button_);
     } else {
       views::Label* email_label = new views::Label(avatar_item.username);
       email_label->SetElideBehavior(gfx::ELIDE_EMAIL);
       email_label->SetEnabled(false);
       email_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
+      name_container_v_spacing =
+          (current_profile_photo->GetPreferredSize().height() -
+           current_profile_name->GetPreferredSize().height() -
+           email_label->GetPreferredSize().height()) / 2;
+      profile_name_layout->set_inside_border_insets(
+          gfx::Insets(name_container_v_spacing, 0));
       profile_name_container->AddChildView(email_label);
     }
     return view;
   }
 
   SigninManagerBase* signin_manager = SigninManagerFactory::GetForProfile(
       browser_->profile()->GetOriginalProfile());
   if (signin_manager->IsSigninAllowed()) {
     views::View* extra_links_view = new views::View();
     views::BoxLayout* extra_links_layout = new views::BoxLayout(
@@ skipping 543 matching lines @@
       IncognitoModePrefs::GetAvailability(browser_->profile()->GetPrefs()) !=
           IncognitoModePrefs::DISABLED;
   return incognito_available && !browser_->profile()->IsGuestSession();
 }
 
 void ProfileChooserView::PostActionPerformed(
     ProfileMetrics::ProfileDesktopMenu action_performed) {
   ProfileMetrics::LogProfileDesktopMenu(action_performed, gaia_service_type_);
   gaia_service_type_ = signin::GAIA_SERVICE_TYPE_NONE;
 }