[cros] Remove Views implementation for login/OOBE.

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"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_shutdown.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
 #include "chrome/browser/chromeos/dbus/session_manager_client.h"
 #include "chrome/browser/chromeos/customization_document.h"
 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
 #include "chrome/browser/chromeos/input_method/input_method_util.h"
 #include "chrome/browser/chromeos/language_preferences.h"
 #include "chrome/browser/chromeos/login/existing_user_controller.h"
 #include "chrome/browser/chromeos/login/helper.h"
 #include "chrome/browser/chromeos/login/language_switch_menu.h"
 #include "chrome/browser/chromeos/login/login_utils.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
-#include "chrome/browser/chromeos/login/views_login_display_host.h"
 #include "chrome/browser/chromeos/login/webui_login_display_host.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/chromeos/mobile_config.h"
 #include "chrome/browser/chromeos/system/timezone_settings.h"
 #include "chrome/browser/policy/browser_policy_connector.h"
 #include "chrome/browser/prefs/pref_service.h"
-#include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "googleurl/src/gurl.h"
 #include "third_party/cros_system_api/window_manager/chromeos_wm_ipc_enums.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "unicode/timezone.h"
 
 #if defined(TOOLKIT_USES_GTK)
 #include "chrome/browser/chromeos/wm_ipc.h"
@@ skipping 198 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)

[altimofeev, 2011/11/07 11:07:09]

nit: this if-else is not needed anymore

[Nikita (slow), 2011/11/07 11:27:43]

Done.

   // 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);
-  }
+  display_host = new chromeos::WebUILoginDisplayHost(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();
@@ skipping 70 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