Added shortcut for NW config screen in kiosk.

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 "apps/app_window.h"
 #include "apps/app_window_registry.h"
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 101 matching lines @@
       diagnostic_mode_(diagnostic_mode),
       host_(host),
       oobe_display_(oobe_display),
       app_launch_splash_screen_actor_(
           oobe_display_->GetAppLaunchSplashScreenActor()),
       webui_visible_(false),
       launcher_ready_(false),
       waiting_for_network_(false),
       network_wait_timedout_(false),
       showing_network_dialog_(false),
+      network_config_requested_(false),
       launch_splash_start_time_(0) {
 }
 
 AppLaunchController::~AppLaunchController() {
   app_launch_splash_screen_actor_->SetDelegate(NULL);
 }
 
 void AppLaunchController::StartAppLaunch() {
   DVLOG(1) << "Starting kiosk mode...";
 
@@ skipping 77 matching lines @@
     OnReadyToLaunch();
 }
 
 void AppLaunchController::OnCancelAppLaunch() {
   if (KioskAppManager::Get()->GetDisableBailoutShortcut())
     return;
 
   OnLaunchFailed(KioskAppLaunchError::USER_CANCEL);
 }
 
+void AppLaunchController::OnNetworkConfigRequested(bool requested) {
+  LOG(ERROR) << "OnNetworkConfigRequested: " << requested;

[xiyuan, 2014/03/26 16:24:16]

nit: Do we still need the LOG here and around line 230? If we do, maybe change
it to LOG(WARNING) or VLOG?

[zel, 2014/03/26 17:30:58]

Done.

+  network_config_requested_ = requested;
+  if (requested)
+    MaybeShowNetworkConfigureUI();
+  else
+    startup_app_launcher_->RestartLauncher();
+}
+
 void AppLaunchController::OnNetworkStateChanged(bool online) {
+  LOG(ERROR) << "OnNetworkStateChanged: "
+      << "online: " << online
+      << ", waiting_for_network_: " << waiting_for_network_
+      << ", network_config_requested_: " << network_config_requested_
+      << ", network_wait_timedout_: " << network_wait_timedout_;
   if (!waiting_for_network_)
     return;
 
-  if (online)
+  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;
 
   kiosk_profile_loader_.reset();
@@ skipping 59 matching lines @@
     return need_owner_auth_to_configure_network_callback_->Run();
 
   policy::BrowserPolicyConnectorChromeOS* connector =
       g_browser_process->platform_part()->browser_policy_connector_chromeos();
   return !connector->IsEnterpriseManaged();
 }
 
 void AppLaunchController::MaybeShowNetworkConfigureUI() {
   if (CanConfigureNetwork()) {
     if (NeedOwnerAuthToConfigureNetwork()) {
-      app_launch_splash_screen_actor_->ToggleNetworkConfig(true);
+      if (network_config_requested_)
+        OnConfigureNetwork();
+      else
+        app_launch_splash_screen_actor_->ToggleNetworkConfig(true);
     } else {
       showing_network_dialog_ = true;
       app_launch_splash_screen_actor_->ShowNetworkConfigureUI();
     }
   } else {
     app_launch_splash_screen_actor_->UpdateAppLaunchState(
         AppLaunchSplashScreenActor::APP_LAUNCH_STATE_NETWORK_WAIT_TIMEOUT);
   }
 }
 
 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(
       FROM_HERE,
       base::TimeDelta::FromSeconds(network_wait_time_),
       this, &AppLaunchController::OnNetworkWaitTimedout);
 
   app_launch_splash_screen_actor_->UpdateAppLaunchState(
       AppLaunchSplashScreenActor::APP_LAUNCH_STATE_PREPARING_NETWORK);
 }
@@ skipping 24 matching lines @@
   // configuration dialog if it is being shown.
   if (showing_network_dialog_) {
     app_launch_splash_screen_actor_->Show(app_id_);
     showing_network_dialog_ = false;
     launch_splash_start_time_ = base::TimeTicks::Now().ToInternalValue();
   }
 }
 
 void AppLaunchController::OnReadyToLaunch() {
   launcher_ready_ = true;
+
+  if (network_config_requested_)
+    return;
+
   if (!webui_visible_)
     return;
 
   if (splash_wait_timer_.IsRunning())
     return;
 
   const int64 time_taken_ms = (base::TimeTicks::Now() -
       base::TimeTicks::FromInternalValue(launch_splash_start_time_)).
       InMilliseconds();
 
@@ skipping 25 matching lines @@
   LOG(ERROR) << "Kiosk launch failed. Will now shut down."
              << ", error=" << error;
   DCHECK_NE(KioskAppLaunchError::NONE, error);
 
   // Saves the error and ends the session to go back to login screen.
   KioskAppLaunchError::Save(error);
   chrome::AttemptUserExit();
   CleanUp();
 }
 
+bool AppLaunchController::IsShowingNetworkConfigScreen() {
+  return network_config_requested_;
+}
+
+

[xiyuan, 2014/03/26 16:24:16]

nit: nuke one empty line

[zel, 2014/03/26 17:30:58]

Done.

 }   // namespace chromeos