Update screen locker UI to match webui login

chrome/browser/chromeos/login/username_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/username_view.h"
 
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/login/rounded_view.h"
 #include "grit/generated_resources.h"
@@ skipping 10 matching lines @@
 namespace chromeos {
 
 namespace {
 // Username label background color.
 const SkColor kLabelBackgoundColor = 0x55000000;
 // Holds margin to height ratio.
 const double kMarginRatio = 1.0 / 3.0;
 // Holds the frame width for the small shaped username view.
 const SkScalar kSmallShapeFrameWidth = SkIntToScalar(1);
 
-// Class that sets up half rounded rectangle (only the bottom corners are
-// rounded) as a clip region of the view.
-// For more info see the file "chrome/browser/chromeos/login/rounded_view.h".
-template<typename C>
-class HalfRoundedView : public RoundedView<C> {
- public:
-  HalfRoundedView(const std::wstring &text, bool use_small_shape)
-      : RoundedView<C>(text, use_small_shape) {
-  }
-
- protected:
-  // Overrides ViewFilter.
-  virtual SkPath GetClipPath() const {
-    if (!C::use_small_shape()) {
-      return RoundedView<C>::GetClipPath();
-    } else {
-      SkPath path;
-      gfx::Rect frame_bounds = this->bounds();
-      frame_bounds.Inset(kSmallShapeFrameWidth, kSmallShapeFrameWidth,
-                   kSmallShapeFrameWidth, kSmallShapeFrameWidth);
-      path.addRect(SkIntToScalar(frame_bounds.x()),
-                   SkIntToScalar(frame_bounds.y()),
-                   SkIntToScalar(frame_bounds.x() + frame_bounds.width()),
-                   SkIntToScalar(frame_bounds.y() + frame_bounds.height()));
-      return path;
-    }
-  }
-
-  virtual void DrawFrame(gfx::Canvas* canvas) {
-    // No frame is needed.
-  }
-
-  virtual SkRect GetViewRect() const {
-    SkRect view_rect;
-    // The rectangle will be intersected with the bounds, so the correct half
-    // of the round rectangle will be obtained.
-    view_rect.iset(this->x(),
-                   this->y() - this->height(),
-                   this->x() + this->width(),
-                   this->y() + this->height());
-    return view_rect;
-  }
-};
-
 }  // namespace
 
 UsernameView::UsernameView(const std::wstring& username, bool use_small_shape)
     : views::Label(username.empty()
           ? UTF16ToWide(l10n_util::GetStringUTF16(IDS_GUEST)) : username),
       use_small_shape_(use_small_shape),
       is_guest_(username.empty()) {
 }
 
 UsernameView::~UsernameView() {}
 
 void UsernameView::OnPaint(gfx::Canvas* canvas) {
   gfx::Rect bounds = GetContentsBounds();
   if (text_image_ == NULL)
     PaintUsername(bounds);
   DCHECK(text_image_ != NULL);
   DCHECK(bounds.size() ==
          gfx::Size(text_image_->width(), text_image_->height()));
   canvas->DrawBitmapInt(*text_image_, bounds.x(), bounds.y());
 }
 
 // static
 UsernameView* UsernameView::CreateShapedUsernameView(
     const std::wstring& username, bool use_small_shape) {
-  return new HalfRoundedView<UsernameView>(username, use_small_shape);
+  return new UsernameView(username, use_small_shape);
 }
 
 gfx::NativeCursor UsernameView::GetCursor(const views::MouseEvent& event) {
   return use_small_shape_ ? gfx::GetCursor(GDK_HAND2) : NULL;
 }
 
 void UsernameView::PaintUsername(const gfx::Rect& bounds) {
   margin_width_ = bounds.height() * kMarginRatio;
   gfx::CanvasSkia canvas(bounds.width(), bounds.height(), false);
   // Draw transparent background.
@@ skipping 79 matching lines @@
 void UsernameView::OnLocaleChanged() {
   if (is_guest_) {
     SetText(UTF16ToWide(l10n_util::GetStringUTF16(IDS_GUEST)));
   }
   // Repaint because the font may have changed.
   text_image_.reset();
   SchedulePaint();
 }
 
 }  // namespace chromeos