Revert of Added shortcut for NW config screen in kiosk.

chrome/browser/chromeos/login/app_launch_controller.cc

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 ce30f7652222912b60f0855066c2046f45b5fd27..7cda1fc3eb69eeecce5dbb5f1491bc5b6c0ace95 100644
--- a/chrome/browser/chromeos/login/app_launch_controller.cc
+++ b/chrome/browser/chromeos/login/app_launch_controller.cc
@@ -119,7 +119,6 @@
       waiting_for_network_(false),
       network_wait_timedout_(false),
       showing_network_dialog_(false),
-      network_config_requested_(false),
       launch_splash_start_time_(0) {
 }
 
@@ -217,19 +216,11 @@
   OnLaunchFailed(KioskAppLaunchError::USER_CANCEL);
 }
 
-void AppLaunchController::OnNetworkConfigRequested(bool requested) {
-  network_config_requested_ = requested;
-  if (requested)
-    MaybeShowNetworkConfigureUI();
-  else
-    startup_app_launcher_->RestartLauncher();
-}
-
 void AppLaunchController::OnNetworkStateChanged(bool online) {
   if (!waiting_for_network_)
     return;
 
-  if (online && !network_config_requested_)
+  if (online)
     startup_app_launcher_->ContinueWithNetworkReady();
   else if (network_wait_timedout_)
     MaybeShowNetworkConfigureUI();
@@ -309,10 +300,7 @@
 void AppLaunchController::MaybeShowNetworkConfigureUI() {
   if (CanConfigureNetwork()) {
     if (NeedOwnerAuthToConfigureNetwork()) {
-      if (network_config_requested_)
-        OnConfigureNetwork();
-      else
-        app_launch_splash_screen_actor_->ToggleNetworkConfig(true);
+      app_launch_splash_screen_actor_->ToggleNetworkConfig(true);
     } else {
       showing_network_dialog_ = true;
       app_launch_splash_screen_actor_->ShowNetworkConfigureUI();
@@ -324,7 +312,7 @@
 }
 
 void AppLaunchController::InitializeNetwork() {
-  // Show the network configuration dialog if network is not initialized
+  // Show the network configration dialog if network is not initialized
   // after a brief wait time.
   waiting_for_network_ = true;
   network_wait_timer_.Start(
@@ -369,10 +357,6 @@
 
 void AppLaunchController::OnReadyToLaunch() {
   launcher_ready_ = true;
-
-  if (network_config_requested_)
-    return;
-
   if (!webui_visible_)
     return;
 
@@ -418,8 +402,4 @@
   CleanUp();
 }
 
-bool AppLaunchController::IsShowingNetworkConfigScreen() {
-  return network_config_requested_;
-}
-
 }   // namespace chromeos