Integrate WebUI Login with cros.

chrome/browser/chromeos/login/background_view.cc

Index: chrome/browser/chromeos/login/background_view.cc
diff --git a/chrome/browser/chromeos/login/background_view.cc b/chrome/browser/chromeos/login/background_view.cc
index 2f3e05525bcf3e9e96ad7ce606697e2083787622..e3b7363cb78ee8ef2a4987d8bd7e7853b5f0b793 100644
--- a/chrome/browser/chromeos/login/background_view.cc
+++ b/chrome/browser/chromeos/login/background_view.cc
@@ -42,11 +42,6 @@
 #include "views/screen.h"
 #include "views/window/window.h"
 
-// X Windows headers have "#define Status int". That interferes with
-// NetworkLibrary header which defines enum "Status".
-#include <X11/cursorfont.h>  // NOLINT
-#include <X11/Xcursor/Xcursor.h>  // NOLINT
-
 using views::Widget;
 
 namespace {
@@ -72,17 +67,6 @@ int GetStepId(size_t step) {
   }
 }
 
-// This gets rid of the ugly X default cursor.
-static void ResetXCursor() {
-  // TODO(sky): nuke this once new window manager is in place.
-  Display* display = ui::GetXDisplay();
-  Cursor cursor = XCreateFontCursor(display, XC_left_ptr);
-  XID root_window = ui::GetX11RootWindow();
-  XSetWindowAttributes attr;
-  attr.cursor = cursor;
-  XChangeWindowAttributes(display, root_window, CWCursor, &attr);
-}
-
 }  // namespace
 
 namespace chromeos {
@@ -96,7 +80,6 @@ BackgroundView::BackgroundView()
       boot_times_label_(NULL),
       progress_bar_(NULL),
       shutdown_button_(NULL),
-      did_paint_(false),
 #if defined(OFFICIAL_BUILD)
       is_official_build_(true),
 #else
@@ -143,8 +126,6 @@ views::Widget* BackgroundView::CreateWindowContainingView(
     const gfx::Rect& bounds,
     const GURL& background_url,
     BackgroundView** view) {
-  ResetXCursor();
-
   Widget* window = new Widget;
   Widget::InitParams params(Widget::InitParams::TYPE_WINDOW);
   params.bounds = bounds;
@@ -228,14 +209,6 @@ bool BackgroundView::ScreenSaverEnabled() {
 ///////////////////////////////////////////////////////////////////////////////
 // BackgroundView protected:
 
-void BackgroundView::OnPaint(gfx::Canvas* canvas) {
-  views::View::OnPaint(canvas);
-  if (!did_paint_) {
-    did_paint_ = true;
-    UpdateWindowType();
-  }
-}
-
 void BackgroundView::Layout() {
   const int kCornerPadding = 5;
   const int kInfoLeftPadding = 10;
@@ -416,7 +389,6 @@ void BackgroundView::InitProgressBar() {
 
 void BackgroundView::UpdateWindowType() {
   std::vector<int> params;
-  params.push_back(did_paint_ ? 1 : 0);

[sky, 2011/05/23 15:16:39]

Did you also update the window manager side of things?

[rharrison, 2011/05/25 02:58:55]

The window manager does not appear to do anything with the parameters for this
window type. I think the change was made in the window manager to not require
this and this code was never cleaned up.

The comments in chromeos_wm_ipc_enums.h need to be cleaned up though. I will
have to put that in an new CL, since it is in platform/cros.

   WmIpc::instance()->SetWindowType(
       GTK_WIDGET(GetNativeWindow()),
       WM_IPC_WINDOW_LOGIN_BACKGROUND,