Added shortcut for NW config screen in kiosk.

chrome/browser/chromeos/app_mode/startup_app_launcher.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/app_mode/startup_app_launcher.h"
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/path_service.h"
@@ skipping 33 matching lines @@
 #include "url/gurl.h"
 
 using content::BrowserThread;
 using extensions::Extension;
 using extensions::WebstoreStartupInstaller;
 
 namespace chromeos {
 
 namespace {
 
+const int kRerunDelay = 2;

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

no longer needed.

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

Done.

 const char kOAuthRefreshToken[] = "refresh_token";
 const char kOAuthClientId[] = "client_id";
 const char kOAuthClientSecret[] = "client_secret";
 
 const base::FilePath::CharType kOAuthFileName[] =
     FILE_PATH_LITERAL("kiosk_auth");
 
 const int kMaxInstallAttempt = 5;
 
 }  // namespace
@@ skipping 77 matching lines @@
     UserManager::Get()->SetAppModeChromeClientOAuthInfo(
             auth_params_.client_id,
             auth_params_.client_secret);
   }
 
   // If we are restarting chrome (i.e. on crash), we need to initialize
   // OAuth2TokenService as well.
   InitializeTokenService();
 }
 
+void StartupAppLauncher::RestartLauncher() {
+  // If installer is still running in the background, delay the restart.

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

nit: Update the comment to clarify that start up continues after the current
installer is finished.

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

Done.

+  if (installer_ != NULL) {
+    LOG(WARNING) << "Installer still running";
+    return;
+  }
+
+  MaybeInitializeNetwork();
+}
+
 void StartupAppLauncher::MaybeInitializeNetwork() {
   network_ready_handled_ = false;
 
   const Extension* extension = extensions::ExtensionSystem::Get(profile_)->
       extension_service()->GetInstalledExtension(app_id_);
   const bool requires_network = !extension ||
       !extensions::OfflineEnabledInfo::IsOfflineEnabled(extension);
 
   if (requires_network) {
     delegate_->InitializeNetwork();
@@ skipping 127 matching lines @@
       app_id_,
       profile_,
       false,
       base::Bind(&StartupAppLauncher::InstallCallback, AsWeakPtr()));
   installer_->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.
     BrowserThread::PostTask(
         BrowserThread::UI,
         FROM_HERE,
         base::Bind(&StartupAppLauncher::OnReadyToLaunch,
                    AsWeakPtr()));
     return;
   }
 
   LOG(ERROR) << "App install failed: " << error
              << ", for attempt " << install_attempt_;
 
   ++install_attempt_;
   if (install_attempt_ < kMaxInstallAttempt) {
     BrowserThread::PostTask(
         BrowserThread::UI,
         FROM_HERE,
         base::Bind(&StartupAppLauncher::MaybeInitializeNetwork,
                    AsWeakPtr()));
     return;
   }
 
-  OnLaunchFailure(KioskAppLaunchError::UNABLE_TO_INSTALL);
+  if (!delegate_->IsShowingNetworkConfigScreen())

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

This "if" seem unnecessary.

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

Done.

+    OnLaunchFailure(KioskAppLaunchError::UNABLE_TO_INSTALL);
 }
 
 void StartupAppLauncher::OnReadyToLaunch() {
   ready_to_launch_ = true;
   delegate_->OnReadyToLaunch();
 }
 
 void StartupAppLauncher::UpdateAppData() {
   KioskAppManager::Get()->ClearAppData(app_id_);
   KioskAppManager::Get()->UpdateAppDataFromProfile(app_id_, profile_, NULL);
 }
 
 }   // namespace chromeos