kiosk: Network connectivity test during launch.

chrome/browser/chromeos/app_mode/startup_app_launcher.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_APP_MODE_STARTUP_APP_LAUNCHER_H_
 #define CHROME_BROWSER_CHROMEOS_APP_MODE_STARTUP_APP_LAUNCHER_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #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;
 
 namespace extensions {
 class WebstoreStandaloneInstaller;
 }
 
 namespace chromeos {
 
 // Launches the app at startup. The flow roughly looks like this:
 // First call Initialize():
 // - Checks if the app is installed in user profile (aka app profile);
 // - If the app is installed, launch it and finish the flow;
 // - If not installed, prepare to start install by checking network online
 //   state;
 // - If network gets online, start to install the app from web store;
 // Report OnLauncherInitialized() or OnLaunchFailed() to observers:
 // - 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:
     virtual void OnLoadingOAuthFile() = 0;
     virtual void OnInitializingTokenService() = 0;
     virtual void OnInitializingNetwork() = 0;

[Tim Song, 2013/11/21 01:12:17]

Please add a comment for this function that StartupAppLauncher will block until
ContinueWithNetworkReady() is called.

It might also be a good idea to rename the observer to delegate and
OnInitializingNetwork to InitializeNetwork because we are now relying on the
this class for functionality.

[xiyuan, 2013/11/21 22:39:39]

Done.
- OnInitializingNetwork -> InitializeNetwork and added comment.
- Observer -> Delegate

     virtual void OnInstallingApp() = 0;
     virtual void OnReadyToLaunch() = 0;
     virtual void OnLaunchSucceeded() = 0;
     virtual void OnLaunchFailed(KioskAppLaunchError::Error error) = 0;
 
    protected:
     virtual ~Observer() {}
   };
 
   StartupAppLauncher(Profile* profile, const std::string& app_id);
 
   virtual ~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();
 
   // Add and remove observers for app launch procedure.
   void AddObserver(Observer* observer);
   void RemoveObserver(Observer* observer);
 
  private:
   // OAuth parameters from /home/chronos/kiosk_auth file.
   struct KioskOAuthParams {
@@ skipping 13 matching lines @@
   void InitializeNetwork();
 
   void StartLoadingOAuthFile();
   static void LoadOAuthFileOnBlockingPool(KioskOAuthParams* auth_params);
   void OnOAuthFileLoaded(KioskOAuthParams* auth_params);
 
   // OAuth2TokenService::Observer overrides.
   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_;
   KioskOAuthParams auth_params_;
 
   DISALLOW_COPY_AND_ASSIGN(StartupAppLauncher);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_APP_MODE_STARTUP_APP_LAUNCHER_H_