More Aura fixes to build with chromeos==1

chrome/browser/chromeos/login/base_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/base_login_display_host.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/threading/thread_restrictions.h"
@@ skipping 245 matching lines @@
 
   gfx::Rect screen_bounds(chromeos::CalculateScreenBounds(size));
 
   // Check whether we need to execute OOBE process.
   bool oobe_complete = chromeos::WizardController::IsOobeCompleted();
   bool show_login_screen =
       (first_screen_name.empty() && oobe_complete) ||
       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.
     // If user has manually changed locale during R11 OOBE, locale will be set.
     // On R12 > R12|R13 etc. this fix won't get activated since
     // OOBE process has set kApplicationLocale to non-default value.
     PrefService* prefs = g_browser_process->local_state();
     if (!prefs->HasPrefPath(prefs::kApplicationLocale)) {
       std::string locale = chromeos::WizardController::GetInitialLocale();
       prefs->SetString(prefs::kApplicationLocale, locale);
@@ skipping 69 matching lines @@
   // user has changed to during OOBE.
   if (!timezone_name.empty()) {
     icu::TimeZone* timezone = icu::TimeZone::createTimeZone(
         icu::UnicodeString::fromUTF8(timezone_name));
     CHECK(timezone) << "Timezone could not be set for " << timezone_name;
     chromeos::system::TimezoneSettings::GetInstance()->SetTimezone(*timezone);
   }
 }
 
 }  // namespace browser