Fix username label's color (regression from r66060)

chrome/browser/chromeos/login/user_controller.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/user_controller.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "app/l10n_util.h"
@@ skipping 31 matching lines @@
 
 namespace {
 
 // Gap between the border around the image/buttons and user name.
 const int kUserNameGap = 4;
 
 // Approximate height of controls window, this constant is used in new user
 // 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;
 
 // Widget that notifies window manager about clicking on itself.
 // Doesn't send anything if user is selected.
 class ClickNotifyingWidget : public views::WidgetGtk {
  public:
   ClickNotifyingWidget(views::WidgetGtk::Type type,
                        UserController* controller)
       : WidgetGtk(type),
@@ skipping 404 matching lines @@
   else
     unselected_label_view_ = label;
 
   int width = (type == WM_IPC_WINDOW_LOGIN_LABEL) ?
       kUserImageSize : kUnselectedSize;
   if (is_new_user_) {
     // Make label as small as possible to don't show tooltip.
     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,
                        gfx::Rect(0, 0, width, height),
                        type,
                        label);
   return window;
 }
 
 gfx::Rect UserController::GetScreenBounds() const {
@@ skipping 31 matching lines @@
 
 void UserController::SelectUser(int index) {
   delegate_->SelectUser(index);
 }
 
 void UserController::FocusPasswordField() {
   existing_user_view_->FocusPasswordField();
 }
 
 }  // namespace chromeos