| 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 4e52f2cf4ab1fd04a4d2e522c02c184e88094669..a585b2c265b92ae0ab65b3ae8071b69ef0408906 100644
|
| --- a/chrome/browser/chromeos/login/app_launch_controller.h
|
| +++ b/chrome/browser/chromeos/login/app_launch_controller.h
|
| @@ -87,6 +87,7 @@ class AppLaunchController
|
| // AppLaunchSplashScreenActor::Delegate overrides:
|
| virtual void OnConfigureNetwork() OVERRIDE;
|
| virtual void OnCancelAppLaunch() OVERRIDE;
|
| + virtual void OnNetworkConfigRequested(bool requested) OVERRIDE;
|
| virtual void OnNetworkStateChanged(bool online) OVERRIDE;
|
|
|
| // StartupAppLauncher::Delegate overrides:
|
| @@ -98,6 +99,7 @@ class AppLaunchController
|
| virtual void OnReadyToLaunch() OVERRIDE;
|
| virtual void OnLaunchSucceeded() OVERRIDE;
|
| virtual void OnLaunchFailed(KioskAppLaunchError::Error error) OVERRIDE;
|
| + virtual bool IsShowingNetworkConfigScreen() OVERRIDE;
|
|
|
| // AppLaunchSigninScreen::Delegate overrides:
|
| virtual void OnOwnerSigninSuccess() OVERRIDE;
|
| @@ -129,6 +131,7 @@ class AppLaunchController
|
| bool waiting_for_network_;
|
| bool network_wait_timedout_;
|
| bool showing_network_dialog_;
|
| + bool network_config_requested_;
|
| int64 launch_splash_start_time_;
|
|
|
| static bool skip_splash_wait_;
|
|
|