kiosk: Network connectivity test during launch.

chrome/browser/chromeos/app_mode/startup_app_launcher.h

Index: chrome/browser/chromeos/app_mode/startup_app_launcher.h
diff --git a/chrome/browser/chromeos/app_mode/startup_app_launcher.h b/chrome/browser/chromeos/app_mode/startup_app_launcher.h
index b7d7baf47dec320be9bd322236ae87a04d89b9bc..3eda0cd34aa9acbeafcd6d3fab64161d583d38bf 100644
--- a/chrome/browser/chromeos/app_mode/startup_app_launcher.h
+++ b/chrome/browser/chromeos/app_mode/startup_app_launcher.h
@@ -13,7 +13,6 @@
 #include "base/observer_list.h"
 #include "chrome/browser/chromeos/app_mode/kiosk_app_launch_error.h"
 #include "google_apis/gaia/oauth2_token_service.h"
-#include "net/base/network_change_notifier.h"
 
 class Profile;
 
@@ -34,8 +33,7 @@ namespace chromeos {
 // - If all goes good, launches the app and finish the flow;
 class StartupAppLauncher
     : public base::SupportsWeakPtr<StartupAppLauncher>,
-      public OAuth2TokenService::Observer,
-      public net::NetworkChangeNotifier::NetworkChangeObserver {
+      public OAuth2TokenService::Observer {
  public:
   class Observer {
    public:
@@ -58,6 +56,9 @@ class StartupAppLauncher
   // Prepares the environment for an app launch.
   void Initialize();
 
+  // Continues the initialization after network is ready.
+  void ContinueWithNetworkReady();
+
   // Launches the app after the initialization is successful.
   void LaunchApp();
 
@@ -91,13 +92,10 @@ class StartupAppLauncher
   virtual void OnRefreshTokenAvailable(const std::string& account_id) OVERRIDE;
   virtual void OnRefreshTokensLoaded() OVERRIDE;
 
-  // net::NetworkChangeNotifier::NetworkChangeObserver overrides:
-  virtual void OnNetworkChanged(
-      net::NetworkChangeNotifier::ConnectionType type) OVERRIDE;
-
   Profile* profile_;
   const std::string app_id_;
   ObserverList<Observer> observer_list_;
+  bool install_attempted_;
   bool ready_to_launch_;
 
   scoped_refptr<extensions::WebstoreStandaloneInstaller> installer_;