kiosk: Show network config UI after profile load

chrome/browser/chromeos/login/app_launch_controller.cc

 // Copyright 2013 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.
 
 #include "chrome/browser/chromeos/login/app_launch_controller.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/files/file_path.h"
 #include "base/json/json_file_value_serializer.h"
@@ skipping 217 matching lines @@
   } else {
     // If kiosk mode was configured through enterprise policy, we may
     // not have an owner user.
     // TODO(tengs): We need to figure out the appropriate security meausres
     // for this case.
     NOTREACHED();
   }
 }
 
 void AppLaunchController::OnOwnerSigninSuccess() {
-  app_launch_splash_screen_actor_->ShowNetworkConfigureUI();
+  ShowNetworkConfigureUIWhenReady();
   signin_screen_.reset();
 }
 
 void AppLaunchController::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   DCHECK_EQ(chrome::NOTIFICATION_LOGIN_OR_LOCK_WEBUI_VISIBLE, type);
   DCHECK(!webui_visible_);
   webui_visible_ = true;
   launch_splash_start_time_ = base::TimeTicks::Now().ToInternalValue();
   if (launcher_ready_)
     OnReadyToLaunch();
 }
 
 void AppLaunchController::OnCancelAppLaunch() {
   if (KioskAppManager::Get()->GetDisableBailoutShortcut())
     return;
 
   OnLaunchFailed(KioskAppLaunchError::USER_CANCEL);
 }
 
 void AppLaunchController::OnNetworkConfigRequested(bool requested) {
   network_config_requested_ = requested;
-  if (requested)
+  if (requested) {
     MaybeShowNetworkConfigureUI();
-  else
+  } else {
+    app_launch_splash_screen_actor_->UpdateAppLaunchState(
+        AppLaunchSplashScreenActor::APP_LAUNCH_STATE_PREPARING_NETWORK);
     startup_app_launcher_->RestartLauncher();
+  }
 }
 
 void AppLaunchController::OnNetworkStateChanged(bool online) {
   if (!waiting_for_network_)
     return;
 
   if (online && !network_config_requested_)
     startup_app_launcher_->ContinueWithNetworkReady();
   else if (network_wait_timedout_)
     MaybeShowNetworkConfigureUI();
 }
 
 void AppLaunchController::OnProfileLoaded(Profile* profile) {
   DVLOG(1) << "Profile loaded... Starting app launch.";
   profile_ = profile;
 
   // This is needed to trigger input method extensions being loaded.
   profile_->InitChromeOSPreferences();
 
   kiosk_profile_loader_.reset();
   startup_app_launcher_.reset(
       new StartupAppLauncher(profile_, app_id_, diagnostic_mode_, this));
   startup_app_launcher_->Initialize();
+
+  if (show_network_config_ui_after_profile_load_)
+    ShowNetworkConfigureUIWhenReady();
 }
 
 void AppLaunchController::OnProfileLoadFailed(
     KioskAppLaunchError::Error error) {
   OnLaunchFailed(error);
 }
 
 void AppLaunchController::ClearNetworkWaitTimer() {
   waiting_for_network_ = false;
   network_wait_timer_.Stop();
@@ skipping 53 matching lines @@
 }
 
 void AppLaunchController::MaybeShowNetworkConfigureUI() {
   if (CanConfigureNetwork()) {
     if (NeedOwnerAuthToConfigureNetwork()) {
       if (network_config_requested_)
         OnConfigureNetwork();
       else
         app_launch_splash_screen_actor_->ToggleNetworkConfig(true);
     } else {
-      showing_network_dialog_ = true;
-      app_launch_splash_screen_actor_->ShowNetworkConfigureUI();
+      ShowNetworkConfigureUIWhenReady();
     }
   } else {
     app_launch_splash_screen_actor_->UpdateAppLaunchState(
         AppLaunchSplashScreenActor::APP_LAUNCH_STATE_NETWORK_WAIT_TIMEOUT);
   }
 }
 
+void AppLaunchController::ShowNetworkConfigureUIWhenReady() {
+  if (!profile_) {
+    show_network_config_ui_after_profile_load_ = true;
+    app_launch_splash_screen_actor_->UpdateAppLaunchState(
+        AppLaunchSplashScreenActor::
+            APP_LAUNCH_STATE_SHOWING_NETWORK_CONFIGURE_UI);
+    return;
+  }
+
+  show_network_config_ui_after_profile_load_ = false;
+  showing_network_dialog_ = true;
+  app_launch_splash_screen_actor_->ShowNetworkConfigureUI();
+}
+
 void AppLaunchController::InitializeNetwork() {
   // Show the network configuration dialog if network is not initialized
   // after a brief wait time.
   waiting_for_network_ = true;
   network_wait_timer_.Start(
       FROM_HERE,
       base::TimeDelta::FromSeconds(network_wait_time_),
       this, &AppLaunchController::OnNetworkWaitTimedout);
 
   app_launch_splash_screen_actor_->UpdateAppLaunchState(
@@ skipping 82 matching lines @@
   KioskAppLaunchError::Save(error);
   chrome::AttemptUserExit();
   CleanUp();
 }
 
 bool AppLaunchController::IsShowingNetworkConfigScreen() {
   return network_config_requested_;
 }
 
 }   // namespace chromeos