| Index: chrome/browser/chromeos/login/app_launch_controller.cc
|
| diff --git a/chrome/browser/chromeos/login/app_launch_controller.cc b/chrome/browser/chromeos/login/app_launch_controller.cc
|
| index 7cda1fc3eb69eeecce5dbb5f1491bc5b6c0ace95..a4611a343344d7c8281f835531103011c6009eb9 100644
|
| --- a/chrome/browser/chromeos/login/app_launch_controller.cc
|
| +++ b/chrome/browser/chromeos/login/app_launch_controller.cc
|
| @@ -119,6 +119,7 @@ AppLaunchController::AppLaunchController(const std::string& app_id,
|
| waiting_for_network_(false),
|
| network_wait_timedout_(false),
|
| showing_network_dialog_(false),
|
| + network_config_requested_(false),
|
| launch_splash_start_time_(0) {
|
| }
|
|
|
| @@ -216,11 +217,17 @@ void AppLaunchController::OnCancelAppLaunch() {
|
| OnLaunchFailed(KioskAppLaunchError::USER_CANCEL);
|
| }
|
|
|
| +void AppLaunchController::OnNetworkConfigRequested(bool requested) {
|
| + network_config_requested_ = requested;
|
| + if (requested)
|
| + MaybeShowNetworkConfigureUI();
|
| +}
|
| +
|
| void AppLaunchController::OnNetworkStateChanged(bool online) {
|
| if (!waiting_for_network_)
|
| return;
|
|
|
| - if (online)
|
| + if (online && !network_config_requested_)
|
| startup_app_launcher_->ContinueWithNetworkReady();
|
| else if (network_wait_timedout_)
|
| MaybeShowNetworkConfigureUI();
|
| @@ -312,7 +319,7 @@ void AppLaunchController::MaybeShowNetworkConfigureUI() {
|
| }
|
|
|
| void AppLaunchController::InitializeNetwork() {
|
| - // Show the network configration dialog if network is not initialized
|
| + // Show the network configuration dialog if network is not initialized
|
| // after a brief wait time.
|
| waiting_for_network_ = true;
|
| network_wait_timer_.Start(
|
|
|