Vertically centering the user name for guest mode.

Vertically centering the user name for guest mode.

BUG=181079
TEST=visual

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=201934

[Mr4D (OOO till 08-26), 2013-05-22 22:45:41]

Please have a look!

[James Cook, 2013-05-23 15:49:42]

lgtm

[commit-bot: I haz the power, 2013-05-23 16:05:08]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/skuhne@chromium.org/15738017/3001

[commit-bot: I haz the power, 2013-05-23 16:05:09]

Failed to apply patch for ash/system/user/tray_user.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file ash/system/user/tray_user.cc
  Hunk #1 succeeded at 799 (offset 36 lines).
  Hunk #2 succeeded at 818 (offset 36 lines).
  Hunk #3 FAILED at 795.
  1 out of 3 hunks FAILED -- saving rejects to file
ash/system/user/tray_user.cc.rej

Patch:       ash/system/user/tray_user.cc
Index: ash/system/user/tray_user.cc
diff --git a/ash/system/user/tray_user.cc b/ash/system/user/tray_user.cc
index
5c56e901e4c5e76cdd483e156419db2da71ff86e..2eeeb38ea74009880c7d06f502c43a13d214d084
100644
--- a/ash/system/user/tray_user.cc
+++ b/ash/system/user/tray_user.cc
@@ -763,18 +763,14 @@ void UserView::AddUserCard(SystemTrayItem* owner,
   }
   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;
@@ -786,7 +782,6 @@ void UserView::AddUserCard(SystemTrayItem* owner,
 
     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.
@@ -800,11 +795,19 @@ void UserView::AddUserCard(SystemTrayItem* owner,
       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_->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_->AddChildView(details);
+  } else {
+    if (username)
+      user_card_->AddChildView(username);
+    if (additional)
+      user_card_->AddChildView(additional);
+  }
 }
 
 views::View* UserView::CreateIconForUserCard(ash::user::LoginStatus login) {

[commit-bot: I haz the power, 2013-05-23 17:30:05]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/skuhne@chromium.org/15738017/9001

[commit-bot: I haz the power, 2013-05-24 00:34:50]

Change committed as 201934