[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 62 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.

[Nikita (slow), 2011/07/15 07:11:02]

We should behave the same and show OOBE WebUI on touch builds with current
implementation.
Keeping them separate means supporting 2 different paths.

All OOBE/login WebUI is behind the flag and there's a special flag
/root/.use_webui_login 

if [ -f /root/.use_webui_login ] ; then
  SKIP_OOBE="--login-screen=login"
  WEBUI_LOGIN="--webui-login"
fi

that means that OOBE will be skipped for now.

[Fady Samuel, 2011/07/15 15:06:07]

That's fair. A couple of days ago, we were getting the OOBE on TOUCH builds
which was a bit hard to use on that platform so I added this code. Feel free to
remove it, as long as there's another way to bypass the OOBE on TOUCH_UI builds.

[xiyuan, 2011/07/15 18:26:23]

Okay. Per discussion, I'll use kOobeUURL for now. And added <enter> key handling
to make touch easier to use.

 #if defined(TOUCH_UI)
-    LoadURL(GURL(kLoginURL));
-#else
-    LoadURL(GURL(kOobeURL));
+  LoadURL(GURL(kLoginURL));
 #endif
 
   BaseLoginDisplayHost::StartSignInScreen();
 
+#if !defined(TOUCH_UI)
+  // OobeUI is only available with kOobeURL.
   OobeUI* oobe_ui = static_cast<OobeUI*>(login_view_->GetWebUI());
   oobe_ui->ShowSigninScreen();
+#endif
 }
 
 void WebUILoginDisplayHost::LoadURL(const GURL& url) {
   if (!login_window_) {
     views::Widget::InitParams params(
         views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
     params.bounds = background_bounds();
 
     login_window_ = new views::Widget;
     login_window_->Init(params);
@@ skipping 14 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