Make border window transparent for Add User pod

and enable background for NewUserView.

BUG=http://code.google.com/p/chromium-os/issues/detail?id=8101
TEST=manual

Review URL: http://codereview.chromium.org/4104012

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64372 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 3 insertions, 23 deletions

diff --git a/chrome/browser/chromeos/login/new_user_view.cc b/chrome/browser/chromeos/login/new_user_view.cc
index 89bace3..539b498 100644
--- a/chrome/browser/chromeos/login/new_user_view.cc
+++ b/chrome/browser/chromeos/login/new_user_view.cc
@@ -106,9 +106,9 @@ NewUserView::~NewUserView() {
 void NewUserView::Init() {
   if (need_border_) {
     // Use rounded rect background.
-    set_border(CreateWizardBorder(&BorderDefinition::kScreenBorder));
+    set_border(CreateWizardBorder(&BorderDefinition::kUserBorder));
     views::Painter* painter = CreateWizardPainter(
-        &BorderDefinition::kScreenBorder);
+        &BorderDefinition::kUserBorder);
     set_background(views::Background::CreateBackgroundPainter(true, painter));
   }
 
diff --git a/chrome/browser/chromeos/login/user_controller.cc b/chrome/browser/chromeos/login/user_controller.cc
index 504ca84..252318f 100644
--- a/chrome/browser/chromeos/login/user_controller.cc
+++ b/chrome/browser/chromeos/login/user_controller.cc
@@ -292,29 +292,9 @@ void UserController::IsActiveChanged(bool active) {
     delegate_->OnUserSelected(this);
     user_view_->SetRemoveButtonVisible(
         !is_new_user_ && !is_guest_ && !is_owner_);
-    // Background is NULL for inactive new user pod to make it transparent.
-    if (is_new_user_ && !border_window_->GetRootView()->background()) {
-      views::Painter* painter = CreateWizardPainter(
-          &BorderDefinition::kUserBorder);
-      border_window_->GetRootView()->set_background(
-          views::Background::CreateBackgroundPainter(true, painter));
-      border_window_->GetRootView()->SchedulePaint();
-    }
   } else {
     user_view_->SetRemoveButtonVisible(false);
     delegate_->ClearErrors();
-    if (is_new_user_) {
-      gfx::Rect controls_bounds;
-      controls_window_->GetBounds(&controls_bounds, true);
-      gfx::Rect screen_bounds =
-          views::Screen::GetMonitorWorkAreaNearestWindow(NULL);
-      // The windows was moved out of screen so the pod was really deactivated,
-      // otherwise it just some dialog was shown and took focus.
-      if (!screen_bounds.Intersects(controls_bounds)) {
-        border_window_->GetRootView()->set_background(NULL);
-        border_window_->GetRootView()->SchedulePaint();
-      }
-    }
   }
 }
 
@@ -348,7 +328,7 @@ WidgetGtk* UserController::CreateControlsWindow(
   views::View* control_view;
   if (is_new_user_) {
     new_user_view_ =
-        new NewUserView(this, false, need_browse_without_signin);
+        new NewUserView(this, true, need_browse_without_signin);
     new_user_view_->Init();
     control_view = new_user_view_;
   } else if (is_guest_) {