Login pod visual enhancements.

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"
 #include "app/resource_bundle.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/user_cros_settings_provider.h"
 #include "chrome/browser/chromeos/login/existing_user_view.h"
 #include "chrome/browser/chromeos/login/guest_user_view.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/login/user_view.h"
 #include "chrome/browser/chromeos/login/username_view.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/notification_type.h"
 #include "cros/chromeos_wm_ipc_enums.h"
 #include "gfx/canvas.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "views/background.h"
@@ skipping 50 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(ClickNotifyingWidget);
 };
 
 void CloseWindow(views::WidgetGtk* window) {
   if (!window)
     return;
   window->SetWidgetDelegate(NULL);
   window->Close();
 }
 
-// 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 chromeos::RoundedView<C> {
- public:
-  explicit HalfRoundedView(const std::wstring &text): RoundedView<C>(text) {
-  }
-
- protected:
-  // Overrides ViewFilter.
-  virtual void DrawFrame(gfx::Canvas* canvas) {
-    // No frame is needed.
-  }
-
-  virtual SkRect GetViewRect() const {
-    gfx::Rect bounds = C::GetLocalBounds(false);
-    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(bounds.x(), bounds.y() - bounds.width(),
-                   bounds.x() + bounds.width(),
-                   bounds.y() + bounds.height());
-    view_rect.inset(2 * rounded_view::kStrokeWidth,
-                    2 * rounded_view::kStrokeWidth);
-    return view_rect;
-  }
-};
-
 }  // namespace
 
 using login::kBackgroundColor;
 using login::kBorderSize;
 using login::kTextColor;
 using login::kUserImageSize;
 
 // static
 const int UserController::kPadding = 30;
 
@@ skipping 359 matching lines @@
     text = l10n_util::GetString(IDS_GUEST);
   } else if (is_new_user_) {
     // Add user should have label only in activated state.
     // When new user is the only, label is not needed.
     if (type == WM_IPC_WINDOW_LOGIN_LABEL && index != 0)
       text = l10n_util::GetString(IDS_ADD_USER);
   } else {
     text = UTF8ToWide(user_.GetDisplayName());
   }
 
-  views::Label *label = is_new_user_ ?
-      new views::Label(text) : new HalfRoundedView<UsernameView>(text);
+  views::Label *label = NULL;
+
+  if (is_new_user_) {
+    label = new views::Label(text);
+  } else if (type == WM_IPC_WINDOW_LOGIN_LABEL) {
+    label = UsernameView::CreateShapedUsernameView(text, false);
+  } else {
+    DCHECK(type == WM_IPC_WINDOW_LOGIN_UNSELECTED_LABEL);
+    // TODO(altimofeev): switch to the rounded username view.
+    label = UsernameView::CreateShapedUsernameView(text, true);
+  }
 
   label->SetColor(kTextColor);
   label->SetFont(font);
 
   if (type == WM_IPC_WINDOW_LOGIN_LABEL)
     label_view_ = label;
   else
     unselected_label_view_ = label;
 
   int width = (type == WM_IPC_WINDOW_LOGIN_LABEL) ?
@@ skipping 61 matching lines @@
 
 void UserController::SelectUser(int index) {
   delegate_->SelectUser(index);
 }
 
 void UserController::FocusPasswordField() {
   existing_user_view_->FocusPasswordField();
 }
 
 }  // namespace chromeos