Vertically centering the user name for guest mode.

ash/system/user/tray_user.cc

 // Copyright (c) 2012 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/system/user/tray_user.h"
 
 #include <algorithm>
 #include <climits>
 #include <vector>
 
@@ skipping 781 matching lines @@
     icon->set_border(views::Border::CreateEmptyBorder(
         0, kTrayUserTileHoverBorderInset, 0, 0));
     set_border(views::Border::CreateEmptyBorder(
         kUserCardVerticalPadding,
         kTrayPopupPaddingHorizontal - kTrayUserTileHoverBorderInset,
         kUserCardVerticalPadding,
         kTrayPopupPaddingHorizontal));
   }
   ash::SessionStateDelegate* delegate =
       ash::Shell::GetInstance()->session_state_delegate();
-  views::View* details = new views::View;
-  details->SetLayoutManager(new views::BoxLayout(
-      views::BoxLayout::kVertical, 0, kUserDetailsVerticalPadding, 0));
   views::Label* username = NULL;
   ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
   if (!multiprofile_index_) {
-    views::Label* username = new views::Label(
+    username = new views::Label(
         login == ash::user::LOGGED_IN_GUEST ?
             bundle.GetLocalizedString(IDS_ASH_STATUS_TRAY_GUEST_LABEL) :
             delegate->GetUserDisplayName(multiprofile_index_));
     username->SetHorizontalAlignment(gfx::ALIGN_LEFT);
-    details->AddChildView(username);
   }
 
   views::Label* additional = NULL;
   if (login != ash::user::LOGGED_IN_GUEST) {
     additional = new views::Label();
     additional->SetText(login == ash::user::LOGGED_IN_LOCALLY_MANAGED ?
         bundle.GetLocalizedString(IDS_ASH_STATUS_TRAY_LOCALLY_MANAGED_LABEL) :
         UTF8ToUTF16(delegate->GetUserEmail(multiprofile_index_)));
 
     additional->SetFont(bundle.GetFont(ui::ResourceBundle::SmallFont));
     additional->SetHorizontalAlignment(gfx::ALIGN_LEFT);
-    details->AddChildView(additional);
   }
 
   // Adjust text properties dependent on if it is an active or inactive user.
   if (multiprofile_index_) {
     // Fade the text of non active users to 50%.
     SkColor text_color = additional->enabled_color();
     text_color = SkColorSetA(text_color, SkColorGetA(text_color) / 2);
     if (additional)
       additional->SetDisabledColor(text_color);
     if (username)
       username->SetDisabledColor(text_color);
   }
 
-  // Use a small font for email address if username exists as well.
-  if (username)
-    additional->SetFont(bundle.GetFont(ui::ResourceBundle::SmallFont));
-
-  user_card_view_->AddChildView(details);
+  if (additional && username) {
+    views::View* details = new views::View;
+    details->SetLayoutManager(new views::BoxLayout(
+        views::BoxLayout::kVertical, 0, kUserDetailsVerticalPadding, 0));
+    details->AddChildView(username);
+    details->AddChildView(additional);
+    user_card_view_->AddChildView(details);
+  } else {
+    if (username)
+      user_card_view_->AddChildView(username);
+    if (additional)
+      user_card_view_->AddChildView(additional);
+  }
 }
 
 views::View* UserView::CreateIconForUserCard(ash::user::LoginStatus login) {
   RoundedImageView* icon = new RoundedImageView(kProfileRoundedCornerRadius,
                                                 multiprofile_index_ == 0);
   icon->SetEnabled(false);
   if (login == ash::user::LOGGED_IN_GUEST) {
     icon->SetImage(*ui::ResourceBundle::GetSharedInstance().
         GetImageNamed(IDR_AURA_UBER_TRAY_GUEST_ICON).ToImageSkia(),
         gfx::Size(kUserIconSize, kUserIconSize));
@@ skipping 356 matching lines @@
   if (avatar_) {
     avatar_->SetImage(
         ash::Shell::GetInstance()->session_state_delegate()->GetUserImage(
             multiprofile_index_),
         gfx::Size(kUserIconSize, kUserIconSize));
   }
 }
 
 }  // namespace internal
 }  // namespace ash