[ChromeOS] WebUI OOBE/Login refactoring.

chrome/browser/chromeos/login/webui_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/webui_login_display_host.h"
 
 #include "chrome/browser/chromeos/login/oobe_display.h"
 #include "chrome/browser/chromeos/login/webui_login_display.h"
 #include "chrome/browser/chromeos/login/webui_login_view.h"
 #include "chrome/browser/chromeos/login/touch_login_view.h"
@@ skipping 63 matching lines @@
 
 void WebUILoginDisplayHost::StartWizard(const std::string& first_screen_name,
                                         const GURL& start_url) {
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAllowWebUIOobe))
     LoadURL(GURL(kOobeURL));
   BaseLoginDisplayHost::StartWizard(first_screen_name, start_url);
 }
 
 void WebUILoginDisplayHost::StartSignInScreen() {
   if (!login_window_)
-  // TODO(fsamuel): Use the OOBE once it's touch-friendly.
-#if defined(TOUCH_UI)
-    LoadURL(GURL(kLoginURL));
-#else
     LoadURL(GURL(kOobeURL));
-#endif
 
   BaseLoginDisplayHost::StartSignInScreen();
 
   OobeUI* oobe_ui = static_cast<OobeUI*>(login_view_->GetWebUI());
   oobe_ui->ShowSigninScreen();
 }
 
 void WebUILoginDisplayHost::LoadURL(const GURL& url) {
   if (!login_window_) {
     views::Widget::InitParams params(
@@ skipping 19 matching lines @@
   login_view_->LoadURL(url);
 }
 
 WizardController* WebUILoginDisplayHost::CreateWizardController() {
   // TODO(altimofeev): ensure that WebUI is ready.
   OobeDisplay* oobe_display = static_cast<OobeUI*>(login_view_->GetWebUI());
   return new WizardController(this, oobe_display);
 }
 
 }  // namespace chromeos