Fix username label's color (regression from r66060)

chrome/browser/chromeos/login/screen_lock_view.cc

 // 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.
 
 #include "chrome/browser/chromeos/login/screen_lock_view.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/login/helper.h"
@@ skipping 54 matching lines @@
       main_(NULL),
       username_(NULL) {
   DCHECK(screen_locker_);
 }
 
 gfx::Size ScreenLockView::GetPreferredSize() {
   return main_->GetPreferredSize();
 }
 
 void ScreenLockView::Layout() {
-  int username_height = username_->GetPreferredSize().height();
+  int username_height = login::kSelectedLabelHeight;  // see

[Daniel Erat, 2010/11/16 21:23:41]

fix comment (just says "see")

[oshima, 2010/11/17 17:53:28]

Done.

   main_->SetBounds(0, 0, width(), height());
   username_->SetBounds(
       kBorderSize,
       login::kUserImageSize - username_height + kBorderSize,
       login::kUserImageSize,
       username_height);
 }
 
 void ScreenLockView::Init() {
   registrar_.Add(this,
@@ skipping 19 matching lines @@
 
   // User icon.
   UserManager::User user = screen_locker_->user();
   user_view_->SetImage(user.image());
 
   // User name.
   std::wstring text = UTF8ToWide(user.GetDisplayName());
 
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   const gfx::Font& font =
-      rb.GetFont(ResourceBundle::LargeFont).DeriveFont(0, gfx::Font::BOLD);
+      rb.GetFont(ResourceBundle::MediumBoldFont);

[Daniel Erat, 2010/11/16 21:23:41]

nit: this line can be unwrapped now

[oshima, 2010/11/17 17:53:28]

Done.

 
   // Layouts image, textfield and button components.
   GridLayout* layout = new GridLayout(main_);
   main_->SetLayoutManager(layout);
   views::ColumnSet* column_set = layout->AddColumnSet(0);
   column_set->AddPaddingColumn(0, kBorderSize);
   column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1,
                         GridLayout::USE_PREF, 0, 0);
   column_set->AddPaddingColumn(0, kBorderSize);
 
   column_set = layout->AddColumnSet(1);
   column_set->AddPaddingColumn(0, 5);
   column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1,
                         GridLayout::USE_PREF, 0, 0);
   column_set->AddPaddingColumn(0, 5);
 
   layout->AddPaddingRow(0, kBorderSize);
   layout->StartRow(0, 0);
   layout->AddView(user_view_);
   layout->AddPaddingRow(0, kBorderSize);
   layout->StartRow(0, 1);
   layout->AddView(password_field_);
   layout->AddPaddingRow(0, kBorderSize);
 
   AddChildView(main_);
 
   UsernameView* username = new UsernameView(text);
   username_ = username;
+  username->SetColor(login::kTextColor);
   username->SetFont(font);
   AddChildView(username);
 }
 
 void ScreenLockView::ClearAndSetFocusToPassword() {
   password_field_->RequestFocus();
   password_field_->SetText(string16());
 }
 
 void ScreenLockView::SetSignoutEnabled(bool enabled) {
@@ skipping 53 matching lines @@
   user_view_->SetImage(user->image());
 }
 
 void ScreenLockView::ViewHierarchyChanged(bool is_add,
                                           views::View* parent,
                                           views::View* child) {
   if (is_add && this == child)
     WizardAccessibilityHelper::GetInstance()->MaybeEnableAccessibility(this);
 }
 }  // namespace chromeos