kiosk: Network connectivity test during launch.

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 39 matching lines @@
       GetInstalledExtension(app_id);
 }
 
 }  // namespace
 
 
 StartupAppLauncher::StartupAppLauncher(Profile* profile,
                                        const std::string& app_id)
     : profile_(profile),
       app_id_(app_id),
+      install_attempted_(false),
       ready_to_launch_(false) {
   DCHECK(profile_);
   DCHECK(Extension::IdIsValid(app_id_));
 }
 
 StartupAppLauncher::~StartupAppLauncher() {
   // StartupAppLauncher can be deleted at anytime during the launch process
   // through a user bailout shortcut.
   ProfileOAuth2TokenServiceFactory::GetForProfile(profile_)
       ->RemoveObserver(this);
-  net::NetworkChangeNotifier::RemoveNetworkChangeObserver(this);
 }
 
 void StartupAppLauncher::Initialize() {
-  DVLOG(1) << "Starting... connection = "
-           <<  net::NetworkChangeNotifier::GetConnectionType();
   StartLoadingOAuthFile();
 }
 
+void StartupAppLauncher::ContinueWithNetworkReady() {
+  // Starts install if it is not started.
+  if (!install_attempted_) {
+    install_attempted_ = true;
+    BeginInstall();
+  }
+}
+
 void StartupAppLauncher::AddObserver(Observer* observer) {
   observer_list_.AddObserver(observer);
 }
 
 void StartupAppLauncher::RemoveObserver(Observer* observer) {
   observer_list_.RemoveObserver(observer);
 }
 
 void StartupAppLauncher::StartLoadingOAuthFile() {
   FOR_EACH_OBSERVER(Observer, observer_list_, OnLoadingOAuthFile());
@@ skipping 42 matching lines @@
             auth_params_.client_secret);
   }
 
   // If we are restarting chrome (i.e. on crash), we need to initialize
   // OAuth2TokenService as well.
   InitializeTokenService();
 }
 
 void StartupAppLauncher::InitializeNetwork() {
   FOR_EACH_OBSERVER(Observer, observer_list_, OnInitializingNetwork());
-
-  // TODO(tengs): Use NetworkStateInformer instead because it can handle
-  // portal and proxy detection. We will need to do some refactoring to
-  // make NetworkStateInformer more independent from the WebUI handlers.
-  net::NetworkChangeNotifier::AddNetworkChangeObserver(this);
-  OnNetworkChanged(net::NetworkChangeNotifier::GetConnectionType());
 }
 
 void StartupAppLauncher::InitializeTokenService() {
   FOR_EACH_OBSERVER(Observer, observer_list_, OnInitializingTokenService());
 
   ProfileOAuth2TokenService* profile_token_service =
       ProfileOAuth2TokenServiceFactory::GetForProfile(profile_);
   if (profile_token_service->RefreshTokenIsAvailable(
           profile_token_service->GetPrimaryAccountId()) ||
       auth_params_.refresh_token.empty()) {
@@ skipping 69 matching lines @@
       chrome::NOTIFICATION_KIOSK_APP_LAUNCHED,
       content::NotificationService::AllSources(),
       content::NotificationService::NoDetails());
 
   OnLaunchSuccess();
 }
 
 void StartupAppLauncher::BeginInstall() {
   FOR_EACH_OBSERVER(Observer, observer_list_, OnInstallingApp());
 
-  DVLOG(1) << "BeginInstall... connection = "
-           <<  net::NetworkChangeNotifier::GetConnectionType();
-
   if (IsAppInstalled(profile_, app_id_)) {
     OnReadyToLaunch();
     return;
   }
 
   installer_ = new WebstoreStartupInstaller(
       app_id_,
       profile_,
       false,
       base::Bind(&StartupAppLauncher::InstallCallback, AsWeakPtr()));
@@ skipping 16 matching lines @@
 
   LOG(ERROR) << "App install failed: " << error;
   OnLaunchFailure(KioskAppLaunchError::UNABLE_TO_INSTALL);
 }
 
 void StartupAppLauncher::OnReadyToLaunch() {
   ready_to_launch_ = true;
   FOR_EACH_OBSERVER(Observer, observer_list_, OnReadyToLaunch());
 }
 
-void StartupAppLauncher::OnNetworkChanged(
-    net::NetworkChangeNotifier::ConnectionType type) {
-  DVLOG(1) << "OnNetworkChanged... connection = "
-           <<  net::NetworkChangeNotifier::GetConnectionType();
-  if (!net::NetworkChangeNotifier::IsOffline()) {
-    DVLOG(1) << "Network up and running!";
-    net::NetworkChangeNotifier::RemoveNetworkChangeObserver(this);
-
-    BeginInstall();
-  } else {
-    DVLOG(1) << "Network not running yet!";
-  }
-}
-
 }   // namespace chromeos