Re-land:

chrome/browser/chromeos/login/user_controller.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_controller.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/utf_string_conversions.h"
@@ skipping 401 matching lines @@
   // New user login controls window is much higher than existing user's controls
   // window so window manager will place the control instead of image window.
   // New user will have 0 size border.
   int width = controls_width;
   int height = controls_height;
   if (!is_new_user_) {
     width += kBorderSize * 2;
     height += 2 * kBorderSize + kUserImageSize + kVerticalIntervalSize;
   }
 
-  border_window_ = Widget::CreateWidget();
+  border_window_ = new Widget;
   Widget::InitParams params(Widget::InitParams::TYPE_WINDOW);
   params.transparent = true;
   params.bounds = gfx::Rect(0, 0, width, height);
   border_window_->Init(params);
   if (!is_new_user_) {
     views::View* background_view = new views::View();
     views::Painter* painter = CreateWizardPainter(
         &BorderDefinition::kUserBorder);
     background_view->set_background(
         views::Background::CreateBackgroundPainter(true, painter));
@@ skipping 72 matching lines @@
 std::wstring UserController::GetNameTooltip() const {
   if (is_new_user_)
     return UTF16ToWide(l10n_util::GetStringUTF16(IDS_ADD_USER));
   else if (is_guest_)
     return UTF16ToWide(l10n_util::GetStringUTF16(IDS_GO_INCOGNITO_BUTTON));
   else
     return UTF8ToWide(user_.GetNameTooltip());
 }
 
 }  // namespace chromeos