Update screen locker UI to match webui login

chrome/browser/chromeos/login/user_view.cc

 // 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 "grit/generated_resources.h"
 #include "grit/theme_resources_standard.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/gtk_util.h"
 #include "ui/gfx/rect.h"
 #include "views/background.h"
 #include "views/controls/button/text_button.h"
 #include "views/controls/image_view.h"
 #include "views/controls/label.h"
 #include "views/controls/link.h"
 #include "views/controls/link_listener.h"
 #include "views/painter.h"
 
 namespace {
 
 // Background color and corner radius of the login status label and
 // signout button.
 const SkColor kSignoutBackgroundColor = 0xFF007700;
-const int kSignoutBackgroundCornerRadius = 4;
 
 // Horiz/Vert insets for Signout view.
 const int kSignoutViewHorizontalInsets = 10;
 const int kSignoutViewVerticalInsets = 5;
 const int kMinControlHeight = 16;
 
+// 1x Border around image pod.
+const SkColor kImageBorderColor = 0xFFCCCCCC;
+
 // Padding between remove button and top right image corner.
 const int kRemoveButtonPadding = 3;
 
 // Draws green-ish background for signout view with
 // rounded corners at the bottom.
 class SignoutBackgroundPainter : public views::Painter {
   virtual void Paint(int w, int h, gfx::Canvas* canvas) {
     SkRect rect = {0, 0, w, h};
     SkPath path;
-    path.addRoundRect(rect,
-        kSignoutBackgroundCornerRadius, kSignoutBackgroundCornerRadius);
+    path.addRect(rect);
     SkPaint paint;
     paint.setStyle(SkPaint::kFill_Style);
     paint.setFlags(SkPaint::kAntiAlias_Flag);
     paint.setColor(kSignoutBackgroundColor);
     canvas->AsCanvasSkia()->drawPath(path, paint);
   }
 };
 
 }  // namespace
 
@@ skipping 190 matching lines @@
 UserView::UserView(Delegate* delegate, bool is_login, bool need_background)
     : delegate_(delegate),
       signout_view_(NULL),
       ignore_signout_click_(false),
       image_view_(NULL),
       remove_button_(NULL) {
   DCHECK(delegate);
   if (!is_login)
     signout_view_ = new SignoutView(this);
 
-  if (need_background)
-    image_view_ = new RoundedView<PodImageView>(delegate);
-  else
-    image_view_ = new PodImageView(delegate);
+  image_view_ = new PodImageView(delegate);
+  image_view_->set_border(
+      views::Border::CreateSolidBorder(1, kImageBorderColor));
 
   Init(need_background);
 }
 
 void UserView::Init(bool need_background) {
   if (need_background) {
     image_view_->set_background(
         views::Background::CreateSolidBackground(kBackgroundColor));
   }
 
@@ skipping 59 matching lines @@
     delegate_->OnRemoveUser();
 }
 
 void UserView::OnLocaleChanged() {
   remove_button_->SetText(
       UTF16ToWide(l10n_util::GetStringUTF16(IDS_LOGIN_REMOVE)));
   delegate_->OnLocaleChanged();
 }
 
 }  // namespace chromeos