MD CrOS Shelf - fix alignment of guest user name in shelf bubble.

ash/common/system/user/user_card_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 "ash/common/system/user/user_card_view.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "ash/common/login_status.h"
@@ skipping 546 matching lines @@
   user_name_style.SetupLabel(user_name_);
 
   TrayPopupItemStyle user_email_style(TrayPopupItemStyle::FontStyle::CAPTION);
   // Only the active user's email label is lightened (for the inactive user, the
   // label starts as black and the entire row is 54% opacity).
   if (is_active_user())
     user_email_style.set_color_style(TrayPopupItemStyle::ColorStyle::INACTIVE);
   auto user_email = new views::Label();
   base::string16 user_email_string;
   if (login_status != LoginStatus::GUEST) {
-    SystemTrayDelegate* tray_delegate = WmShell::Get()->system_tray_delegate();
     user_email_string =
-        tray_delegate->IsUserSupervised()
+        WmShell::Get()->system_tray_delegate()->IsUserSupervised()
             ? l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_SUPERVISED_LABEL)
             : base::UTF8ToUTF16(
                   delegate->GetUserInfo(user_index_)->GetDisplayEmail());
   }
   user_email->SetText(user_email_string);
   user_email->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   user_email_style.SetupLabel(user_email);
+  user_email->SetVisible(!user_email_string.empty());
+  user_email->set_collapse_when_hidden(true);
 
   views::View* stack_of_labels = new views::View;
   AddChildView(stack_of_labels);
   layout->SetFlexForView(stack_of_labels, 1);
   stack_of_labels->SetLayoutManager(
       new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 0));
   stack_of_labels->AddChildView(user_name_);
   stack_of_labels->AddChildView(user_email);
   // The name and email have different font sizes. This border is designed
   // to make both views take up equal space so the whitespace between them
@@ skipping 25 matching lines @@
     media_capture_icon_->set_id(VIEW_ID_USER_VIEW_MEDIA_INDICATOR);
 #endif
     AddChildView(media_capture_icon_);
 
     OnMediaCaptureChanged();
   }
 }
 
 }  // namespace tray
 }  // namespace ash