Chromium Code Reviews| Index: chrome/browser/chromeos/login/webui_login_display_host.cc |
| diff --git a/chrome/browser/chromeos/login/webui_login_display_host.cc b/chrome/browser/chromeos/login/webui_login_display_host.cc |
| index a36ebb14c78db26cb3caf8c4f0589e51df2cdaa2..44539d868539df930dd301fd1baec2c25928f535 100644 |
| --- a/chrome/browser/chromeos/login/webui_login_display_host.cc |
| +++ b/chrome/browser/chromeos/login/webui_login_display_host.cc |
| @@ -80,18 +80,18 @@ void WebUILoginDisplayHost::StartWizard(const std::string& first_screen_name, |
| } |
| 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 t
Fady Samuel
2011/07/15 15:06:07
That's fair. A couple of days ago, we were getting
xiyuan
2011/07/15 18:26:23
Okay. Per discussion, I'll use kOobeUURL for now.
|
| #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) { |