Screen Locker fixes

chrome/browser/chromeos/login/user_view.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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_view.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/login/helper.h"
 #include "chrome/browser/chromeos/login/rounded_rect_painter.h"
 #include "chrome/browser/chromeos/login/rounded_view.h"
+#include "chrome/browser/chromeos/view_ids.h"
 #include "gfx/canvas.h"
 #include "gfx/canvas_skia.h"
 #include "gfx/gtk_util.h"
 #include "gfx/rect.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "views/background.h"
 #include "views/controls/button/text_button.h"
@@ skipping 58 matching lines @@
         UTF16ToWide(l10n_util::GetStringUTF16(IDS_SCREEN_LOCK_ACTIVE_USER)));
     active_user_label_->SetFont(font);
     active_user_label_->SetColor(kTextColor);
 
     signout_link_ = new views::Link(
         UTF16ToWide(l10n_util::GetStringUTF16(IDS_SCREEN_LOCK_SIGN_OUT)));
     signout_link_->SetController(link_controller);
     signout_link_->SetFont(font);
     signout_link_->SetColor(kTextColor);
     signout_link_->SetFocusable(true);
+    signout_link_->SetHighlightedColor(kTextColor);
+    signout_link_->SetDisabledColor(kTextColor);
+    signout_link_->SetNormalColor(kTextColor);
+    signout_link_->SetID(VIEW_ID_SCREEN_LOCKER_SIGNOUT_LINK);
 
     AddChildView(active_user_label_);
     AddChildView(signout_link_);
 
     set_background(views::Background::CreateBackgroundPainter(
         true, new SignoutBackgroundPainter()));
   }
 
   // views::View overrides.
   virtual void Layout() {
@@ skipping 235 matching lines @@
   if (remove_button_ == sender)
     delegate_->OnRemoveUser();
 }
 
 void UserView::OnLocaleChanged() {
   remove_button_->SetText(
       UTF16ToWide(l10n_util::GetStringUTF16(IDS_LOGIN_REMOVE)));
 }
 
 }  // namespace chromeos