| Index: chrome/browser/chromeos/login/app_launch_controller.h
|
| diff --git a/chrome/browser/chromeos/login/app_launch_controller.h b/chrome/browser/chromeos/login/app_launch_controller.h
|
| index c0399a7a51d88d16ebd0d772952aed724ea2f93a..be4b1893b6fc3a088868252b280995f1100838d8 100644
|
| --- a/chrome/browser/chromeos/login/app_launch_controller.h
|
| +++ b/chrome/browser/chromeos/login/app_launch_controller.h
|
| @@ -16,7 +16,7 @@
|
| #include "chrome/browser/chromeos/app_mode/kiosk_profile_loader.h"
|
| #include "chrome/browser/chromeos/app_mode/startup_app_launcher.h"
|
| #include "chrome/browser/chromeos/login/app_launch_signin_screen.h"
|
| -#include "chrome/browser/chromeos/login/screens/app_launch_splash_screen_actor.h"
|
| +#include "chrome/browser/chromeos/login/screens/app_launch_splash_screen_view.h"
|
| #include "content/public/browser/notification_observer.h"
|
| #include "content/public/browser/notification_registrar.h"
|
|
|
| @@ -30,12 +30,11 @@ class OobeUI;
|
| // Controller for the kiosk app launch process, responsible for
|
| // coordinating loading the kiosk profile, launching the app, and
|
| // updating the splash screen UI.
|
| -class AppLaunchController
|
| - : public AppLaunchSplashScreenActor::Delegate,
|
| - public KioskProfileLoader::Delegate,
|
| - public StartupAppLauncher::Delegate,
|
| - public AppLaunchSigninScreen::Delegate,
|
| - public content::NotificationObserver {
|
| +class AppLaunchController : public AppLaunchSplashScreenView::Delegate,
|
| + public KioskProfileLoader::Delegate,
|
| + public StartupAppLauncher::Delegate,
|
| + public AppLaunchSigninScreen::Delegate,
|
| + public content::NotificationObserver {
|
| public:
|
| typedef base::Callback<bool()> ReturnBoolCallback;
|
|
|
| @@ -92,7 +91,7 @@ class AppLaunchController
|
| void OnProfileLoaded(Profile* profile) override;
|
| void OnProfileLoadFailed(KioskAppLaunchError::Error error) override;
|
|
|
| - // AppLaunchSplashScreenActor::Delegate overrides:
|
| + // AppLaunchSplashScreenView::Delegate overrides:
|
| void OnConfigureNetwork() override;
|
| void OnCancelAppLaunch() override;
|
| void OnNetworkConfigRequested(bool requested) override;
|
| @@ -123,7 +122,7 @@ class AppLaunchController
|
| const bool diagnostic_mode_;
|
| LoginDisplayHost* host_ = nullptr;
|
| OobeUI* oobe_ui_ = nullptr;
|
| - AppLaunchSplashScreenActor* app_launch_splash_screen_actor_ = nullptr;
|
| + AppLaunchSplashScreenView* app_launch_splash_screen_view_ = nullptr;
|
| std::unique_ptr<KioskProfileLoader> kiosk_profile_loader_;
|
| std::unique_ptr<StartupAppLauncher> startup_app_launcher_;
|
| std::unique_ptr<AppLaunchSigninScreen> signin_screen_;
|
|
|