chromeos/aura: Make login screen status area font non-bold.

chrome/browser/chromeos/status/status_area_button.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 "chrome/browser/chromeos/status/status_area_button.h"
 
 #include "grit/theme_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/skbitmap_operations.h"
 #include "ui/views/border.h"
 #include "ui/views/view.h"
 
 namespace {
 
 // Colors for different text styles.
 const SkColor kWhitePlainTextColor = 0x99ffffff;
-const SkColor kGrayPlainTextColor = 0x99666666;
+const SkColor kGrayPlainTextColor = 0xff666666;
 const SkColor kWhiteHaloedTextColor = 0xb3ffffff;
 const SkColor kWhiteHaloedHaloColor = 0xb3000000;
 const SkColor kGrayEmbossedTextColor = 0xff4c4c4c;
 const SkColor kGrayEmbossedShadowColor = 0x80ffffff;
 
 // Status area font is bigger.
 const int kFontSizeDelta = 3;
 
 // Pad for status icons.
 const int kIconHorizontalPad = 2;
 
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // StatusAreaButton
 
 StatusAreaButton::StatusAreaButton(Delegate* button_delegate,
                                    views::ViewMenuDelegate* menu_delegate)
     : MenuButton(NULL, string16(), menu_delegate, false),
       menu_active_(true),
       delegate_(button_delegate) {
   set_border(NULL);
 
-  gfx::Font font =
-      ResourceBundle::GetSharedInstance().GetFont(ResourceBundle::BaseFont);
-  font = font.DeriveFont(kFontSizeDelta);
-  font = delegate_->GetStatusAreaFont(font);
-  SetFont(font);
+  light_font_ =
+      ResourceBundle::GetSharedInstance().GetFont(ResourceBundle::BaseFont).
+      DeriveFont(kFontSizeDelta);
+  bold_font_ = light_font_.DeriveFont(0, gfx::Font::BOLD);
 
   SetShowMultipleIconStates(false);
   set_alignment(TextButton::ALIGN_CENTER);
   set_border(views::Border::CreateEmptyBorder(
       0, kIconHorizontalPad, 0, kIconHorizontalPad));
 
   // Use an offset that is top aligned with toolbar.
   set_menu_offset(0, 4);
 
   UpdateTextStyle();
@@ skipping 72 matching lines @@
   return MenuButton::HitTest(point);
 }
 
 void StatusAreaButton::SetMenuActive(bool active) {
   menu_active_ = active;
 }
 
 void StatusAreaButton::UpdateTextStyle() {
   ClearEmbellishing();
   switch (delegate_->GetStatusAreaTextStyle()) {
-    case WHITE_PLAIN:
+    case WHITE_PLAIN_BOLD:
+      SetFont(bold_font_);
       SetEnabledColor(kWhitePlainTextColor);
       break;
-    case GRAY_PLAIN:
+    case GRAY_PLAIN_LIGHT:
+      SetFont(light_font_);
       SetEnabledColor(kGrayPlainTextColor);
       break;
-    case WHITE_HALOED:
+    case WHITE_HALOED_BOLD:
+      SetFont(bold_font_);
       SetEnabledColor(kWhiteHaloedTextColor);
       SetTextHaloColor(kWhiteHaloedHaloColor);
       break;
-    case GRAY_EMBOSSED:
+    case GRAY_EMBOSSED_BOLD:
+      SetFont(bold_font_);
       SetEnabledColor(kGrayEmbossedTextColor);
       SetTextShadowColors(kGrayEmbossedShadowColor, kGrayEmbossedShadowColor);
       SetTextShadowOffset(0, 1);
       break;
   }
   SchedulePaint();
 }
 
 int StatusAreaButton::icon_height() {
   return 24;
 }
 
 int StatusAreaButton::icon_width() {
   return 23;
 }
 
 int StatusAreaButton::horizontal_padding() {
   return 1;
 }