Fix username label's color (regression from r66060)

Change the font size to medium.

BUG=chromium-os:9194
TEST=login and lock the screen using short power keypress. Confirm the uesrname has the same font/color as in login screen.

Review URL: http://codereview.chromium.org/5074001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66343 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 9 insertions, 9 deletions

diff --git a/chrome/browser/chromeos/login/helper.h b/chrome/browser/chromeos/login/helper.h
index 58acadd..f69d3fc 100644
--- a/chrome/browser/chromeos/login/helper.h
+++ b/chrome/browser/chromeos/login/helper.h
@@ -85,6 +85,10 @@ const int kWizardScreenHeight = 450;
 const int kScreenCornerRadius = 10;
 const int kUserCornerRadius = 5;
 
+// Username label height in different states.
+const int kSelectedLabelHeight = 25;
+const int kUnselectedLabelHeight = 20;
+
 class WideButton : public views::NativeButton {
  public:
   WideButton(views::ButtonListener* listener, const std::wstring& text)
diff --git a/chrome/browser/chromeos/login/screen_lock_view.cc b/chrome/browser/chromeos/login/screen_lock_view.cc
index 1213227..cb46fd5 100644
--- a/chrome/browser/chromeos/login/screen_lock_view.cc
+++ b/chrome/browser/chromeos/login/screen_lock_view.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+e// Copyright (c) 2010 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.
 
@@ -72,7 +72,7 @@ gfx::Size ScreenLockView::GetPreferredSize() {
 }
 
 void ScreenLockView::Layout() {
-  int username_height = username_->GetPreferredSize().height();
+  int username_height = login::kSelectedLabelHeight;
   main_->SetBounds(0, 0, width(), height());
   username_->SetBounds(
       kBorderSize,
@@ -111,8 +111,7 @@ void ScreenLockView::Init() {
   std::wstring text = UTF8ToWide(user.GetDisplayName());
 
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-  const gfx::Font& font =
-      rb.GetFont(ResourceBundle::LargeFont).DeriveFont(0, gfx::Font::BOLD);
+  const gfx::Font& font = rb.GetFont(ResourceBundle::MediumBoldFont);
 
   // Layouts image, textfield and button components.
   GridLayout* layout = new GridLayout(main_);
@@ -141,6 +140,7 @@ void ScreenLockView::Init() {
 
   UsernameView* username = new UsernameView(text);
   username_ = username;
+  username->SetColor(login::kTextColor);
   username->SetFont(font);
   AddChildView(username);
 }
diff --git a/chrome/browser/chromeos/login/user_controller.cc b/chrome/browser/chromeos/login/user_controller.cc
index a8b6401..11b011e 100644
--- a/chrome/browser/chromeos/login/user_controller.cc
+++ b/chrome/browser/chromeos/login/user_controller.cc
@@ -49,10 +49,6 @@ const int kUserNameGap = 4;
 // case to make border window size close to existing users.
 const int kControlsHeight = 28;
 
-// Username label height in different states.
-const int kSelectedLabelHeight = 25;
-const int kUnselectedLabelHeight = 20;
-
 // Delta for the unselected username font.
 const int kUnselectedUsernameFontDelta = 1;
 
@@ -477,7 +473,7 @@ WidgetGtk* UserController::CreateLabelWindow(int index,
     width = 0;
   }
   int height = (type == WM_IPC_WINDOW_LOGIN_LABEL) ?
-      kSelectedLabelHeight : kUnselectedLabelHeight;
+      login::kSelectedLabelHeight : login::kUnselectedLabelHeight;
   WidgetGtk* window = new ClickNotifyingWidget(WidgetGtk::TYPE_WINDOW, this);
   ConfigureLoginWindow(window,
                        index,