Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(464)

Unified Diff: chrome/browser/chromeos/login/webui_login_display_host.cc

Issue 7382001: [ChromeOS] WebUI OOBE/Login refactoring. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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) {

Powered by Google App Engine
This is Rietveld 408576698