Move default_host from LoginDisplayHostImpl to LoginDisplayHost.

chrome/browser/chromeos/login/ui/login_display_host_impl.h

 // Copyright 2014 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_UI_LOGIN_DISPLAY_HOST_IMPL_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_UI_LOGIN_DISPLAY_HOST_IMPL_H_
 
 #include <stdint.h>
 
 #include <string>
@@ skipping 28 matching lines @@
 namespace content {
 class RenderFrameHost;
 class WebContents;
 }
 
 namespace chromeos {
 
 class DemoAppLauncher;
 class FocusRingController;
 class KeyboardDrivenOobeKeyHandler;
-class OobeUI;
 class WebUILoginDisplay;
 class WebUILoginView;
 
 // An implementation class for OOBE/login WebUI screen host.
 // It encapsulates controllers, background integration and flow.
 class LoginDisplayHostImpl : public LoginDisplayHost,
                              public content::NotificationObserver,
                              public content::WebContentsObserver,
                              public chromeos::SessionManagerClient::Observer,
                              public chromeos::CrasAudioHandler::AudioObserver,
                              public ash::VirtualKeyboardStateObserver,
                              public keyboard::KeyboardControllerObserver,
                              public gfx::DisplayObserver,
                              public views::WidgetRemovalsObserver {
  public:
   explicit LoginDisplayHostImpl(const gfx::Rect& background_bounds);
   ~LoginDisplayHostImpl() override;
 
-  // Returns the default LoginDisplayHost instance if it has been created.
-  static LoginDisplayHost* default_host() {
-    return default_host_;
-  }
-
   // LoginDisplayHost implementation:
   LoginDisplay* CreateLoginDisplay(LoginDisplay::Delegate* delegate) override;
   gfx::NativeWindow GetNativeWindow() const override;
+  OobeUI* GetOobeUI() const override;
   WebUILoginView* GetWebUILoginView() const override;
   void BeforeSessionStart() override;
   void Finalize() override;
   void OnCompleteLogin() override;
   void OpenProxySettings() override;
   void SetStatusAreaVisible(bool visible) override;
   AutoEnrollmentController* GetAutoEnrollmentController() override;
   void StartWizard(const std::string& first_screen_name) override;
   WizardController* GetWizardController() override;
   AppLaunchController* GetAppLaunchController() override;
   void StartUserAdding(const base::Closure& completion_callback) override;
   void StartSignInScreen(const LoginScreenContext& context) override;
   void OnPreferencesChanged() override;
   void PrewarmAuthentication() override;
   void StartAppLaunch(
       const std::string& app_id,
       bool diagnostic_mode,
       bool auto_launch) override;
   void StartDemoAppLaunch() override;
 
   // Creates WizardController instance.
   WizardController* CreateWizardController();
 
   // Called when the first browser window is created, but before it's shown.
   void OnBrowserCreated();
 
-  // Returns instance of the OOBE WebUI.
-  OobeUI* GetOobeUI() const;
-
   const gfx::Rect& background_bounds() const { return background_bounds_; }
 
   // Trace id for ShowLoginWebUI event (since there exists at most one login
   // WebUI at a time).
   static const int kShowLoginWebUIid;
 
   views::Widget* login_window_for_test() { return login_window_; }
 
   void StartTimeZoneResolve();
 
@@ skipping 85 matching lines @@
   void TryToPlayStartupSound();
 
   // Called when login-prompt-visible signal is caught.
   void OnLoginPromptVisible();
 
   // Used to calculate position of the screens and background.
   gfx::Rect background_bounds_;
 
   content::NotificationRegistrar registrar_;
 
-  // Default LoginDisplayHost.
-  static LoginDisplayHost* default_host_;
-
   // The controller driving the auto-enrollment check.
   scoped_ptr<AutoEnrollmentController> auto_enrollment_controller_;
 
   // Sign in screen controller.
   scoped_ptr<ExistingUserController> existing_user_controller_;
 
   // OOBE and some screens (camera, recovery) controller.
   scoped_ptr<WizardController> wizard_controller_;
 
   scoped_ptr<SignInScreenController> signin_screen_controller_;
@@ skipping 95 matching lines @@
 
   base::WeakPtrFactory<LoginDisplayHostImpl> pointer_factory_;
   base::WeakPtrFactory<LoginDisplayHostImpl> animation_weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(LoginDisplayHostImpl);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_UI_LOGIN_DISPLAY_HOST_IMPL_H_