Integrate WebUI Login with cros.

chrome/browser/chromeos/login/background_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/background_view.h"
 
 #include <string>
 #include <vector>
 
 #include "base/string16.h"
@@ skipping 24 matching lines @@
 #include "third_party/cros/chromeos_wm_ipc_enums.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/x/x11_util.h"
 #include "ui/gfx/gtk_util.h"
 #include "views/controls/button/text_button.h"
 #include "views/controls/label.h"
 #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 {
 
 const SkColor kVersionColor = 0xff5c739f;
 
 // Returns the corresponding step id for step constant.
 int GetStepId(size_t step) {
   switch (step) {
     case chromeos::BackgroundView::SELECT_NETWORK:
       return IDS_OOBE_SELECT_NETWORK;
     case chromeos::BackgroundView::EULA:
       return IDS_OOBE_EULA;
     case chromeos::BackgroundView::SIGNIN:
       return IDS_OOBE_SIGNIN;
     case chromeos::BackgroundView::REGISTRATION:
       return IDS_OOBE_REGISTRATION;
     case chromeos::BackgroundView::PICTURE:
       return IDS_OOBE_PICTURE;
     default:
       NOTREACHED();
       return 0;
   }
 }
 
-// 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 {
 
 ///////////////////////////////////////////////////////////////////////////////
 // BackgroundView public:
 
 BackgroundView::BackgroundView()
     : status_area_(NULL),
       os_version_label_(NULL),
       boot_times_label_(NULL),
       progress_bar_(NULL),
       shutdown_button_(NULL),
-      did_paint_(false),
 #if defined(OFFICIAL_BUILD)
       is_official_build_(true),
 #else
       is_official_build_(false),
 #endif
       background_area_(NULL) {
 }
 
 BackgroundView::~BackgroundView() {}
 
@@ skipping 26 matching lines @@
     shutdown_button_ = NULL;
     SchedulePaint();
   }
 }
 
 // static
 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;
   window->Init(params);
   *view = new BackgroundView();
   (*view)->Init(background_url);
 
   if ((*view)->ScreenSaverEnabled())
     (*view)->ShowScreenSaver();
 
@@ skipping 63 matching lines @@
   return ScreenSaverEnabled() && background_area_->IsVisible();
 }
 
 bool BackgroundView::ScreenSaverEnabled() {
   return background_area_ != NULL;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // 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;
   const int kInfoBottomPadding = 10;
   const int kInfoBetweenLinesPadding = 1;
   const int kProgressBarBottomPadding = 20;
   const int kProgressBarWidth = 750;
   const int kProgressBarHeight = 70;
   gfx::Size status_area_size = status_area_->GetPreferredSize();
   status_area_->SetBounds(
@@ skipping 160 matching lines @@
   if (WizardController::IsRegisterScreenDefined())
     steps.push_back(GetStepId(REGISTRATION));
 #endif
   steps.push_back(GetStepId(PICTURE));
   progress_bar_ = new OobeProgressBar(steps);
   AddChildView(progress_bar_);
 }
 
 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,
       &params);
 }
 
 void BackgroundView::UpdateVersionLabel() {
   if (!CrosLibrary::Get()->EnsureLoaded()) {
     os_version_label_->SetText(
         ASCIIToWide(CrosLibrary::Get()->load_error_string()));
@@ skipping 108 matching lines @@
   boot_times_label_->SetText(ASCIIToWide(boot_times_text));
 }
 
 void BackgroundView::OnPolicyStateChanged(
     policy::CloudPolicySubsystem::PolicySubsystemState state,
     policy::CloudPolicySubsystem::ErrorDetails error_details) {
   UpdateEnterpriseInfo();
 }
 
 }  // namespace chromeos