CrOS MD Menu - Some more user row tweaks.

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 485 matching lines @@
   views::Label* user_name = nullptr;
   SessionStateDelegate* delegate = WmShell::Get()->GetSessionStateDelegate();
   if (is_active_user()) {
     base::string16 user_name_string =
         login_status == LoginStatus::GUEST
             ? l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_GUEST_LABEL)
             : delegate->GetUserInfo(user_index_)->GetDisplayName();
     if (!user_name_string.empty()) {
       user_name = new views::Label(user_name_string);
       user_name->SetHorizontalAlignment(gfx::ALIGN_LEFT);
-      TrayPopupItemStyle user_name_style(nullptr,
-                                         TrayPopupItemStyle::FontStyle::TITLE);
+      TrayPopupItemStyle user_name_style(
+          TrayPopupItemStyle::FontStyle::DEFAULT_VIEW_LABEL);
       user_name_style.SetupLabel(user_name);
     }
   }
 
   views::Label* user_email = NULL;
   if (login_status != LoginStatus::GUEST) {
     SystemTrayDelegate* tray_delegate = WmShell::Get()->system_tray_delegate();
     base::string16 user_email_string =
         tray_delegate->IsUserSupervised()
             ? l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_SUPERVISED_LABEL)
             : base::UTF8ToUTF16(
                   delegate->GetUserInfo(user_index_)->GetDisplayEmail());
     if (!user_email_string.empty()) {
       user_email = new views::Label(user_email_string);
-      user_email->SetFontList(
-          ui::ResourceBundle::GetSharedInstance().GetFontList(
-              ui::ResourceBundle::SmallFont));
       user_email->SetHorizontalAlignment(gfx::ALIGN_LEFT);
       TrayPopupItemStyle user_email_style(
           nullptr, TrayPopupItemStyle::FontStyle::CAPTION);
       user_email_style.set_color_style(
           TrayPopupItemStyle::ColorStyle::INACTIVE);
       user_email_style.SetupLabel(user_email);
     }
   }
 
   if (user_email && user_name) {
@@ skipping 29 matching lines @@
     details->AddChildView(media_indicator->GetMessageView());
     AddChildView(details);
 #else
     AddChildView(user_email);
 #endif
   }
 }
 
 }  // namespace tray
 }  // namespace ash