Added shortcut for NW config screen in kiosk.

chrome/browser/chromeos/app_mode/startup_app_launcher.cc

Index: chrome/browser/chromeos/app_mode/startup_app_launcher.cc
diff --git a/chrome/browser/chromeos/app_mode/startup_app_launcher.cc b/chrome/browser/chromeos/app_mode/startup_app_launcher.cc
index 94e3ef68d66b369956e85d970023e1e19e5008ae..a7b8828dd67d8531bbffd4f4380b2e8b70e65779 100644
--- a/chrome/browser/chromeos/app_mode/startup_app_launcher.cc
+++ b/chrome/browser/chromeos/app_mode/startup_app_launcher.cc
@@ -148,6 +148,18 @@ void StartupAppLauncher::OnOAuthFileLoaded(KioskOAuthParams* auth_params) {
   InitializeTokenService();
 }
 
+void StartupAppLauncher::RestartLauncher() {
+  // If the installer is still running in the background, we don't need to
+  // restart the launch process. We will just wait until it completes and
+  // lunches the kiosk app.
+  if (installer_ != NULL) {
+    LOG(WARNING) << "Installer still running";
+    return;
+  }
+
+  MaybeInitializeNetwork();
+}
+
 void StartupAppLauncher::MaybeInitializeNetwork() {
   network_ready_handled_ = false;
 
@@ -295,6 +307,11 @@ void StartupAppLauncher::BeginInstall() {
 void StartupAppLauncher::InstallCallback(bool success,
                                          const std::string& error) {
   installer_ = NULL;
+  if (delegate_->IsShowingNetworkConfigScreen()) {
+    LOG(WARNING) << "Showing network config screen";
+    return;
+  }
+
   if (success) {
     // Finish initialization after the callback returns.
     // So that the app finishes its installation.