Move part of WizardController static code to StartupUtils

chrome/browser/chromeos/login/webui_login_display_host.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/webui_login_display_host.h"
 
 #include "ash/ash_switches.h"
 #include "ash/desktop_background/user_wallpaper_delegate.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/window_animations.h"
 #include "ash/wm/window_properties.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time.h"
 #include "base/values.h"
 #include "chrome/browser/browser_shutdown.h"
 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"
 #include "chrome/browser/chromeos/login/oobe_display.h"
+#include "chrome/browser/chromeos/login/startup_utils.h"
 #include "chrome/browser/chromeos/login/webui_login_display.h"
 #include "chrome/browser/chromeos/login/webui_login_view.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "content/public/browser/web_ui.h"
@@ skipping 33 matching lines @@
     : LoginDisplayHostImpl(background_bounds),
       login_window_(NULL),
       login_view_(NULL),
       webui_login_display_(NULL),
       is_showing_login_(false),
       is_wallpaper_loaded_(false),
       status_area_saved_visibility_(false),
       crash_count_(0),
       restore_path_(RESTORE_UNKNOWN),
       old_ignore_solo_window_frame_painter_policy_value_(false) {
-  bool is_registered = WizardController::IsDeviceRegistered();
+  bool is_registered = StartupUtils::IsDeviceRegistered();
   bool zero_delay_enabled = WizardController::IsZeroDelayEnabled();
   bool disable_boot_animation = CommandLine::ForCurrentProcess()->
       HasSwitch(switches::kDisableBootAnimation);
   bool disable_oobe_animation = CommandLine::ForCurrentProcess()->
       HasSwitch(switches::kDisableOobeAnimation);
 
   waiting_for_wallpaper_load_ =
       !zero_delay_enabled &&
       (is_registered || !disable_oobe_animation) &&
       (!is_registered || !disable_boot_animation);
@@ skipping 18 matching lines @@
     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 (!WizardController::IsOobeCompleted())
+  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());
   }
@@ skipping 290 matching lines @@
       root->SetProperty(ash::internal::kIgnoreSoloWindowFramePainterPolicy,
                         old_ignore_solo_window_frame_painter_policy_value_);
     }
   }
   login_window_->Close();
   login_window_ = NULL;
   login_view_ = NULL;
 }
 
 }  // namespace chromeos