Fixed ugly text in the material design system menu.

ash/common/system/chromeos/tray_caps_lock.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/common/system/chromeos/tray_caps_lock.h"
 
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/system/tray/actionable_view.h"
 #include "ash/common/system/tray/fixed_sized_image_view.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/system/tray/tray_constants.h"
+#include "ash/common/system/tray/tray_popup_utils.h"
 #include "ash/common/wm_shell.h"
 #include "ash/resources/vector_icons/vector_icons.h"
 #include "base/sys_info.h"
 #include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/base/ime/chromeos/ime_keyboard.h"
 #include "ui/base/ime/chromeos/input_method_manager.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
@@ skipping 12 matching lines @@
   return (ime && ime->GetImeKeyboard())
              ? ime->GetImeKeyboard()->CapsLockIsEnabled()
              : false;
 }
 }
 
 class CapsLockDefaultView : public ActionableView {
  public:
   CapsLockDefaultView()
       : ActionableView(nullptr),
-        text_label_(new views::Label),
-        shortcut_label_(new views::Label) {
+        text_label_(TrayPopupUtils::CreateDefaultLabel()),
+        shortcut_label_(TrayPopupUtils::CreateDefaultLabel()) {
     SetLayoutManager(new views::BoxLayout(views::BoxLayout::kHorizontal,
                                           kTrayPopupPaddingHorizontal, 0,
                                           kTrayPopupPaddingBetweenItems));
 
     FixedSizedImageView* image =
         new FixedSizedImageView(0, GetTrayConstant(TRAY_POPUP_ITEM_HEIGHT));
     if (MaterialDesignController::UseMaterialDesignSystemIcons()) {
       image->SetImage(
           gfx::CreateVectorIcon(kSystemMenuCapsLockIcon, kMenuIconColor));
     } else {
@@ skipping 153 matching lines @@
     image->SetImage(
         bundle.GetImageNamed(IDR_AURA_UBER_TRAY_CAPS_LOCK_DARK).ToImageSkia());
   }
 
   detailed_->AddChildView(image);
 
   const int string_id =
       WmShell::Get()->system_tray_delegate()->IsSearchKeyMappedToCapsLock()
           ? IDS_ASH_STATUS_TRAY_CAPS_LOCK_CANCEL_BY_SEARCH
           : IDS_ASH_STATUS_TRAY_CAPS_LOCK_CANCEL_BY_ALT_SEARCH;
-  views::Label* label = new views::Label(bundle.GetLocalizedString(string_id));
+  views::Label* label = TrayPopupUtils::CreateDefaultLabel();
+  label->SetText(bundle.GetLocalizedString(string_id));
   label->SetMultiLine(true);
   label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   detailed_->AddChildView(label);
   WmShell::Get()->RecordUserMetricsAction(UMA_STATUS_AREA_CAPS_LOCK_DETAILED);
 
   return detailed_;
 }
 
 void TrayCapsLock::DestroyDefaultView() {
   default_ = NULL;
 }
 
 void TrayCapsLock::DestroyDetailedView() {
   detailed_ = NULL;
 }
 
 }  // namespace ash