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