Merge M43: Fix crash on Enrollment screen.

chrome/browser/chromeos/login/ui/oobe_display.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_OOBE_DISPLAY_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_UI_OOBE_DISPLAY_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 
 namespace chromeos {
 
 class AppLaunchSplashScreenActor;
 class AutoEnrollmentCheckScreenActor;
 class ControllerPairingScreenActor;
 class CoreOobeActor;
 class DeviceDisabledScreenActor;
 class EnableDebuggingScreenActor;
 class EnrollmentScreenActor;
+class ErrorScreen;
 class EulaView;
 class GaiaScreenHandler;
 class HIDDetectionView;
 class HostPairingScreenActor;
 class KioskAutolaunchScreenActor;
 class KioskEnableScreenActor;
 class NetworkErrorView;
 class NetworkView;
 class ResetView;
 class SupervisedUserCreationScreenHandler;
@@ skipping 45 matching lines @@
   virtual NetworkView* GetNetworkView() = 0;
   virtual EulaView* GetEulaView() = 0;
   virtual UpdateView* GetUpdateView() = 0;
   virtual EnableDebuggingScreenActor* GetEnableDebuggingScreenActor() = 0;
   virtual EnrollmentScreenActor* GetEnrollmentScreenActor() = 0;
   virtual ResetView* GetResetView() = 0;
   virtual KioskAutolaunchScreenActor* GetKioskAutolaunchScreenActor() = 0;
   virtual KioskEnableScreenActor* GetKioskEnableScreenActor() = 0;
   virtual TermsOfServiceScreenActor* GetTermsOfServiceScreenActor() = 0;
   virtual UserImageView* GetUserImageView() = 0;
-  virtual NetworkErrorView* GetNetworkErrorView() = 0;
+  virtual ErrorScreen* GetErrorScreen() = 0;
   virtual WrongHWIDScreenActor* GetWrongHWIDScreenActor() = 0;
   virtual AutoEnrollmentCheckScreenActor*
       GetAutoEnrollmentCheckScreenActor() = 0;
   virtual HIDDetectionView* GetHIDDetectionView() = 0;
   virtual SupervisedUserCreationScreenHandler*
       GetSupervisedUserCreationScreenActor() = 0;
   virtual AppLaunchSplashScreenActor* GetAppLaunchSplashScreenActor() = 0;
   virtual ControllerPairingScreenActor* GetControllerPairingScreenActor() = 0;
   virtual HostPairingScreenActor* GetHostPairingScreenActor() = 0;
   virtual DeviceDisabledScreenActor* GetDeviceDisabledScreenActor() = 0;
   virtual GaiaScreenHandler* GetGaiaScreenActor() = 0;
   virtual UserBoardView* GetUserBoardScreenActor() = 0;
 
   // Returns if JS side is fully loaded and ready to accept messages.
   // If |false| is returned, then |display_is_ready_callback| is stored
   // and will be called once display is ready.
   virtual bool IsJSReady(const base::Closure& display_is_ready_callback) = 0;
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_UI_OOBE_DISPLAY_H_