Cleanup legacy flags and switches

chrome/browser/chromeos/login/login_display_host_impl.cc

 // Copyright (c) 2012 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/login_display_host_impl.h"
 
 #include <vector>
 
-#include "ash/ash_switches.h"
 #include "ash/desktop_background/desktop_background_controller.h"
 #include "ash/desktop_background/user_wallpaper_delegate.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/window_properties.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/prefs/pref_service.h"
@@ skipping 191 matching lines @@
       (!is_registered || !disable_boot_animation);
 
   // For slower hardware we have boot animation disabled so
   // we'll be initializing WebUI hidden, waiting for user pods to load and then
   // show WebUI at once.
   waiting_for_user_pods_ = !zero_delay_enabled && !waiting_for_wallpaper_load_;
 
   initialize_webui_hidden_ =
       kHiddenWebUIInitializationDefault && !zero_delay_enabled;
 
-  is_boot_animation2_enabled_ = waiting_for_wallpaper_load_ &&
-      !CommandLine::ForCurrentProcess()->HasSwitch(
-          ash::switches::kAshDisableBootAnimation2);
-
   // Prevents white flashing on OOBE (http://crbug.com/131569).
   aura::Env::GetInstance()->set_render_white_bg(false);
 
   // Check if WebUI init type is overriden.
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshWebUIInit)) {
     const std::string override_type = CommandLine::ForCurrentProcess()->
         GetSwitchValueASCII(switches::kAshWebUIInit);
     if (override_type == kWebUIInitParallel)
       initialize_webui_hidden_ = true;
     else if (override_type == kWebUIInitPostpone)
       initialize_webui_hidden_ = false;
   }
 
   // Always postpone WebUI initialization on first boot, otherwise we miss
   // initial animation.
   if (!StartupUtils::IsOobeCompleted())
     initialize_webui_hidden_ = false;
 
   // There is no wallpaper for KioskMode, don't initialize the webui hidden.
   if (chromeos::KioskModeSettings::Get()->IsKioskModeEnabled())
     initialize_webui_hidden_ = false;
 
   if (waiting_for_wallpaper_load_) {
     registrar_.Add(this, chrome::NOTIFICATION_WALLPAPER_ANIMATION_FINISHED,
                    content::NotificationService::AllSources());
   }
 
-  // In boot-animation2 we want to show login WebUI as soon as possible.
-  if ((waiting_for_user_pods_ || is_boot_animation2_enabled_)
-      && initialize_webui_hidden_) {
+  // When we wait for WebUI to be initialized we wait for one of
+  // these notifications.
+  if (waiting_for_user_pods_ && initialize_webui_hidden_) {
     registrar_.Add(this, chrome::NOTIFICATION_LOGIN_WEBUI_VISIBLE,
                    content::NotificationService::AllSources());
     registrar_.Add(this, chrome::NOTIFICATION_LOGIN_NETWORK_ERROR_SHOWN,
                    content::NotificationService::AllSources());
   }
   LOG(INFO) << "Login WebUI >> "
             << "zero_delay: " << zero_delay_enabled
             << " wait_for_wp_load_: " << waiting_for_wallpaper_load_
             << " wait_for_pods_: " << waiting_for_user_pods_
             << " init_webui_hidden_: " << initialize_webui_hidden_;
@@ skipping 507 matching lines @@
   login_window_->Close();
   login_window_ = NULL;
   login_view_ = NULL;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // external
 
 // Declared in login_wizard.h so that others don't need to depend on our .h.
 // TODO(nkostylev): Split this into a smaller functions.
-void ShowLoginWizard(const std::string& first_screen_name,
-                     const gfx::Size& size) {
+void ShowLoginWizard(const std::string& first_screen_name) {
   if (browser_shutdown::IsTryingToQuit())
     return;
 
   // Managed mode is defined as a machine-level setting so we have to reset it
   // each time login screen is shown. See also http://crbug.com/167642
   // TODO(nkostylev): Remove this call when managed mode scope is
   // limited to user session.
   if (ManagedMode::IsInManagedMode())
     ManagedMode::LeaveManagedMode();
 
@@ skipping 21 matching lines @@
     // login screen.
     system::mouse_settings::SetPrimaryButtonRight(
         prefs->GetBoolean(prefs::kOwnerPrimaryMouseButtonRight));
     system::touchpad_settings::SetTapToClick(
         prefs->GetBoolean(prefs::kOwnerTapToClickEnabled));
   }
 
   ui::SetNaturalScroll(CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kNaturalScrollDefault));
 
-  gfx::Rect screen_bounds(chromeos::CalculateScreenBounds(size));
+  gfx::Rect screen_bounds(chromeos::CalculateScreenBounds(gfx::Size()));
 
   // Check whether we need to execute OOBE process.
   bool oobe_complete = chromeos::StartupUtils::IsOobeCompleted();
   if (!oobe_complete) {
     LoginState::Get()->SetLoggedInState(
         LoginState::LOGGED_IN_OOBE, LoginState::LOGGED_IN_USER_NONE);
   } else {
     LoginState::Get()->SetLoggedInState(
         LoginState::LOGGED_IN_NONE, LoginState::LOGGED_IN_USER_NONE);
   }
@@ skipping 83 matching lines @@
   VLOG(1) << "Initial time zone: " << timezone_name;
   // Apply locale customizations only once to preserve whatever locale
   // user has changed to during OOBE.
   if (!timezone_name.empty()) {
     chromeos::system::TimezoneSettings::GetInstance()->SetTimezoneFromID(
         UTF8ToUTF16(timezone_name));
   }
 }
 
 }  // namespace chromeos