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

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

Issue 8233029: More Aura fixes to build with chromeos==1 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Applied sky's comments. Created 9 years, 2 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
« no previous file with comments | « chrome/browser/chromeos/choose_mobile_network_dialog.cc ('k') | chrome/browser/chromeos/login/eula_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/base_login_display_host.cc
diff --git a/chrome/browser/chromeos/login/base_login_display_host.cc b/chrome/browser/chromeos/login/base_login_display_host.cc
index 6fbec925e8fc610a0b3cce75bb367bf3e1017380..8d8a5c603e22eee409f25ab871f50f1dce3a773e 100644
--- a/chrome/browser/chromeos/login/base_login_display_host.cc
+++ b/chrome/browser/chromeos/login/base_login_display_host.cc
@@ -263,11 +263,16 @@ void ShowLoginWizard(const std::string& first_screen_name,
first_screen_name == chromeos::WizardController::kLoginScreenName;
chromeos::LoginDisplayHost* display_host;
+#if defined(USE_AURA)
+ // Under Aura we always use the WebUI.
+ display_host = new chromeos::WebUILoginDisplayHost(screen_bounds);
+#else
if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kWebUILogin)) {
display_host = new chromeos::WebUILoginDisplayHost(screen_bounds);
} else {
display_host = new chromeos::ViewsLoginDisplayHost(screen_bounds);
}
+#endif
if (show_login_screen && chromeos::CrosLibrary::Get()->EnsureLoaded()) {
// R11 > R12 migration fix. See http://crosbug.com/p/4898.
« no previous file with comments | « chrome/browser/chromeos/choose_mobile_network_dialog.cc ('k') | chrome/browser/chromeos/login/eula_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698