[cros,de-hack] Get rid of singleton for the WebUILoginScreen.

chrome/browser/chromeos/login/base_login_display_host.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/base_login_display_host.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/threading/thread_restrictions.h"
@@ skipping 20 matching lines @@
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "googleurl/src/gurl.h"
 #include "third_party/cros_system_api/window_manager/chromeos_wm_ipc_enums.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "unicode/timezone.h"
 
-// TODO(altimofeev): move to ViewsLoginDisplayHost
-#include "chrome/browser/chromeos/login/views_oobe_display.h"
-
 #if defined(TOOLKIT_USES_GTK)
 #include "chrome/browser/chromeos/wm_ipc.h"
 #endif
 
 namespace {
 
 // The delay of triggering initialization of the device policy subsystem
 // after the login screen is initialized. This makes sure that device policy
 // network requests are made while the system is idle waiting for user input.
 const int64 kPolicyServiceInitializationDelayMilliseconds = 100;
@@ skipping 71 matching lines @@
   default_host_ = NULL;
 }
 
 // LoginDisplayHost implementation ---------------------------------------------
 
 void BaseLoginDisplayHost::OnSessionStart() {
   registrar_.RemoveAll();
   MessageLoop::current()->DeleteSoon(FROM_HERE, this);
 }
 
-WizardController* BaseLoginDisplayHost::CreateWizardController() {
-  // TODO(altimofeev): move this code to ViewsLoginDisplayHost when WebUI
-  // implementation will always be used with WebUILoginDisplayHost.
-  oobe_display_.reset(new ViewsOobeDisplay(background_bounds()));
-  WizardController* wizard_controller  =
-      new WizardController(this, oobe_display_.get());
-  oobe_display_->SetScreenObserver(wizard_controller);
-  return wizard_controller;
-}
-
 void BaseLoginDisplayHost::StartWizard(
     const std::string& first_screen_name,
     const GURL& start_url) {
   DVLOG(1) << "Starting wizard, first_screen_name: " << first_screen_name;
   // Create and show the wizard.
   // Note, dtor of the old WizardController should be called before ctor of the
   // new one, because "default_controller()" is updated there. So pure "reset()"
   // is done before new controller creation.
   wizard_controller_.reset();
-
-  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kWebUILogin)) {
-    wizard_controller_.reset(CreateWizardController());
-  } else {
-    // Force views based implementation.
-    wizard_controller_.reset(BaseLoginDisplayHost::CreateWizardController());
-  }
+  wizard_controller_.reset(CreateWizardController());
 
   wizard_controller_->set_start_url(start_url);
   ShowBackground();
   if (!WizardController::IsDeviceRegistered())
     SetOobeProgressBarVisible(true);
   wizard_controller_->Init(first_screen_name);
 }
 
 void BaseLoginDisplayHost::StartSignInScreen() {
-  oobe_display_.reset();
-
   DVLOG(1) << "Starting sign in screen";
   std::vector<chromeos::UserManager::User> users =
       chromeos::UserManager::Get()->GetUsers();
 
   // Fix for users who updated device and thus never passed register screen.
   // If we already have users, we assume that it is not a second part of
   // OOBE. See http://crosbug.com/6289
   if (!WizardController::IsDeviceRegistered() && !users.empty()) {
     VLOG(1) << "Mark device registered because there are remembered users: "
             << users.size();
@@ skipping 179 matching lines @@
   // user has changed to during OOBE.
   if (!timezone_name.empty()) {
     icu::TimeZone* timezone = icu::TimeZone::createTimeZone(
         icu::UnicodeString::fromUTF8(timezone_name));
     CHECK(timezone) << "Timezone could not be set for " << timezone_name;
     chromeos::system::TimezoneSettings::GetInstance()->SetTimezone(*timezone);
   }
 }
 
 }  // namespace browser