Update screen locker UI to match webui login

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"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/chromeos/login/helper.h"
 #include "chrome/browser/chromeos/login/login_utils.h"
 #include "chrome/browser/chromeos/login/oobe_progress_bar.h"
 #include "chrome/browser/chromeos/login/proxy_settings_dialog.h"
 #include "chrome/browser/chromeos/login/rounded_rect_painter.h"
 #include "chrome/browser/chromeos/login/shutdown_button.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/chromeos/status/clock_menu_button.h"
 #include "chrome/browser/chromeos/status/input_method_menu_button.h"
 #include "chrome/browser/chromeos/status/network_menu_button.h"
 #include "chrome/browser/chromeos/status/status_area_view.h"
@@ skipping 15 matching lines @@
 #include "views/controls/button/text_button.h"
 #include "views/controls/label.h"
 #include "views/widget/widget.h"
 
 using views::Widget;
 
 namespace {
 
 const SkColor kVersionColor = 0xff5c739f;
 
+// Tentative background color that matches WebUI login.
+const SkColor kBackgroundColor = 0xfff0f0f0;
+
 // 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:
@@ skipping 26 matching lines @@
 #endif
       background_area_(NULL),
       version_info_updater_(this) {
 }
 
 BackgroundView::~BackgroundView() {
   version_info_updater_.set_delegate(NULL);
 }
 
 void BackgroundView::Init(const GURL& background_url) {
-  views::Painter* painter = CreateBackgroundPainter();
-  set_background(views::Background::CreateBackgroundPainter(true, painter));
+  set_background(
+      views::Background::CreateSolidBackground(kBackgroundColor));
   InitStatusArea();
   InitInfoLabels();
   if (!background_url.is_empty()) {
     Profile* profile = ProfileManager::GetDefaultProfile();
     background_area_ = new DOMView();
     AddChildView(background_area_);
     background_area_->Init(profile, NULL);
     background_area_->SetVisible(false);
     background_area_->LoadURL(background_url);
   }
@@ skipping 272 matching lines @@
 
 void BackgroundView::UpdateWindowType() {
   std::vector<int> params;
   WmIpc::instance()->SetWindowType(
       GTK_WIDGET(GetNativeWindow()),
       WM_IPC_WINDOW_LOGIN_BACKGROUND,
       &params);
 }
 
 }  // namespace chromeos