Refactor app launch controllers

Split function OnNetworkRequested(bool requested) into two more logical
calls.

Bug: 1015383
Change-Id: I3bb5af7fb530e0d3a7a5123069a41dbad44ed997
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1905709
Commit-Queue: Anatoliy Potapchuk <apotapchuk@chromium.org>
Reviewed-by: Roman Sorokin [CET] <rsorokin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#713830}

chrome/browser/chromeos/login/app_launch_controller.cc

@@ -288,15 +288,18 @@ void AppLaunchController::OnCancelAppLaunch() {
   OnLaunchFailed(KioskAppLaunchError::USER_CANCEL);
 }
 
-void AppLaunchController::OnNetworkConfigRequested(bool requested) {
-  network_config_requested_ = requested;
-  if (requested) {
-    MaybeShowNetworkConfigureUI();
-  } else {
-    app_launch_splash_screen_view_->UpdateAppLaunchState(
-        AppLaunchSplashScreenView::APP_LAUNCH_STATE_PREPARING_NETWORK);
-    startup_app_launcher_->RestartLauncher();
-  }
+void AppLaunchController::OnNetworkConfigRequested() {
+  DCHECK(!network_config_requested_);
+  network_config_requested_ = true;
+  MaybeShowNetworkConfigureUI();
+}
+
+void AppLaunchController::OnNetworkConfigFinished() {
+  DCHECK(network_config_requested_);
+  network_config_requested_ = false;
+  app_launch_splash_screen_view_->UpdateAppLaunchState(
+      AppLaunchSplashScreenView::APP_LAUNCH_STATE_PREPARING_NETWORK);
+  startup_app_launcher_->RestartLauncher();
 }
 
 void AppLaunchController::OnNetworkStateChanged(bool online) {

chrome/browser/chromeos/login/app_launch_controller.h

@@ -58,7 +58,8 @@ class AppLaunchController : public KioskProfileLoader::Delegate,
   // AppLaunchSplashScreenView::Delegate:
   void OnConfigureNetwork() override;
   void OnCancelAppLaunch() override;
-  void OnNetworkConfigRequested(bool requested) override;
+  void OnNetworkConfigRequested() override;
+  void OnNetworkConfigFinished() override;
   void OnNetworkStateChanged(bool online) override;
   void OnDeletingSplashScreenView() override;
   KioskAppManagerBase::App GetAppData() override;

chrome/browser/chromeos/login/web_kiosk_controller.cc

@@ -67,17 +67,17 @@ void WebKioskController::OnTimerFire() {
   }
 }
 
-void WebKioskController::OnConfigureNetwork() {
-  // TODO(crbug.com/1006230): Implement when app launch logic is done.
-}
-
 void WebKioskController::OnCancelAppLaunch() {
   KioskAppLaunchError::Save(KioskAppLaunchError::USER_CANCEL);
   CleanUp();
   chrome::AttemptUserExit();
 }
 
-void WebKioskController::OnNetworkConfigRequested(bool requested) {
+void WebKioskController::OnNetworkConfigRequested() {
+  // TODO(crbug.com/1006230): Implement when app launch logic is done.
+}
+
+void WebKioskController::OnNetworkConfigFinished() {
   // TODO(crbug.com/1006230): Implement when app launch logic is done.
 }
 

chrome/browser/chromeos/login/web_kiosk_controller.h

@@ -52,9 +52,9 @@ class WebKioskController : public LoginPerformer::Delegate,
   void OnProfilePrepared(Profile* profile, bool browser_launched) override;
 
   // AppLaunchSplashScreenView::Delegate:
-  void OnConfigureNetwork() override;
   void OnCancelAppLaunch() override;
-  void OnNetworkConfigRequested(bool requested) override;
+  void OnNetworkConfigRequested() override;
+  void OnNetworkConfigFinished() override;
   void OnNetworkStateChanged(bool online) override;
   void OnDeletingSplashScreenView() override;
   KioskAppManagerBase::App GetAppData() override;

chrome/browser/ui/webui/chromeos/login/app_launch_splash_screen_handler.cc

@@ -266,7 +266,7 @@ void AppLaunchSplashScreenHandler::HandleNetworkConfigRequested() {
     return;
 
   network_config_requested_ = true;
-  delegate_->OnNetworkConfigRequested(true);
+  delegate_->OnNetworkConfigRequested();
 }
 
 void AppLaunchSplashScreenHandler::HandleContinueAppLaunch() {
@@ -274,7 +274,7 @@ void AppLaunchSplashScreenHandler::HandleContinueAppLaunch() {
   if (delegate_ && online_state_) {
     network_config_requested_ = false;
     network_config_done_ = true;
-    delegate_->OnNetworkConfigRequested(false);
+    delegate_->OnNetworkConfigFinished();
     Show();
   }
 }

chrome/browser/ui/webui/chromeos/login/app_launch_splash_screen_handler.h

@@ -28,7 +28,10 @@ class AppLaunchSplashScreenView {
     virtual void OnCancelAppLaunch() {}
 
     // Invoked when the network config shortcut key is pressed.
-    virtual void OnNetworkConfigRequested(bool requested) {}
+    virtual void OnNetworkConfigRequested() {}
+
+    // Invoked when the network config did prepare network and is closed.
+    virtual void OnNetworkConfigFinished() {}
 
     // Invoked when network state is changed. |online| is true if the device
     // is connected to the Internet.