kiosk: Network connectivity test during launch.

chrome/browser/chromeos/login/app_launch_controller.h

Index: chrome/browser/chromeos/login/app_launch_controller.h
diff --git a/chrome/browser/chromeos/login/app_launch_controller.h b/chrome/browser/chromeos/login/app_launch_controller.h
index 382cb55c6855c6d764f845570d86cea07db9bb66..be2d463d2842aaa777c85d3567b74296b53ad5e7 100644
--- a/chrome/browser/chromeos/login/app_launch_controller.h
+++ b/chrome/browser/chromeos/login/app_launch_controller.h
@@ -17,7 +17,6 @@
 #include "chrome/browser/chromeos/app_mode/startup_app_launcher.h"
 #include "chrome/browser/chromeos/login/app_launch_signin_screen.h"
 #include "chrome/browser/chromeos/login/screens/app_launch_splash_screen_actor.h"
-#include "chrome/browser/chromeos/login/screens/error_screen_actor.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 
@@ -36,11 +35,11 @@ class AppLaunchController
     : public base::SupportsWeakPtr<AppLaunchController>,
       public AppLaunchSplashScreenActor::Delegate,
       public KioskProfileLoader::Delegate,
-      public StartupAppLauncher::Observer,
+      public StartupAppLauncher::Delegate,
       public AppLaunchSigninScreen::Delegate,
       public content::NotificationObserver {
  public:
-  typedef base::Callback<bool()> CanConfigureNetworkCallback;
+  typedef base::Callback<bool()> ReturnBoolCallback;
 
   AppLaunchController(const std::string& app_id,
                       LoginDisplayHost* host,
@@ -59,7 +58,9 @@ class AppLaunchController
   static void SetNetworkTimeoutCallbackForTesting(base::Closure* callback);
   static void SetNetworkWaitForTesting(int wait_time_secs);
   static void SetCanConfigureNetworkCallbackForTesting(
-      CanConfigureNetworkCallback* can_configure_network_callback);
+      ReturnBoolCallback* can_configure_network_callback);
+  static void SetNeedOwnerAuthToConfigureNetworkCallbackForTesting(
+      ReturnBoolCallback* need_owner_auth_callback);
 
  private:
   // A class to watch app window creation.
@@ -74,6 +75,13 @@ class AppLaunchController
   // Whether the network could be configured during launching.
   bool CanConfigureNetwork();
 
+  // Whether the owner password is needed to configure network.
+  bool NeedOwnerAuthToConfigureNetwork();
+
+  // Show network configuration UI if it is allowed. For consumer mode,
+  // owner password might be checked before showing the network configure UI.
+  void MaybeShowNetworkConfigureUI();
+
   // KioskProfileLoader::Delegate overrides:
   virtual void OnProfileLoaded(Profile* profile) OVERRIDE;
   virtual void OnProfileLoadFailed(KioskAppLaunchError::Error error) OVERRIDE;
@@ -81,11 +89,12 @@ class AppLaunchController
   // AppLaunchSplashScreenActor::Delegate overrides:
   virtual void OnConfigureNetwork() OVERRIDE;
   virtual void OnCancelAppLaunch() OVERRIDE;
+  virtual void OnNetworkStateChanged(bool online) OVERRIDE;
 
-  // StartupAppLauncher::Observer overrides:
+  // StartupAppLauncher::Delegate overrides:
+  virtual void InitializeNetwork() OVERRIDE;
   virtual void OnLoadingOAuthFile() OVERRIDE;
   virtual void OnInitializingTokenService() OVERRIDE;
-  virtual void OnInitializingNetwork() OVERRIDE;
   virtual void OnInstallingApp() OVERRIDE;
   virtual void OnReadyToLaunch() OVERRIDE;
   virtual void OnLaunchSucceeded() OVERRIDE;
@@ -104,7 +113,6 @@ class AppLaunchController
   LoginDisplayHost* host_;
   OobeDisplay* oobe_display_;
   AppLaunchSplashScreenActor* app_launch_splash_screen_actor_;
-  ErrorScreenActor* error_screen_actor_;
   scoped_ptr<KioskProfileLoader> kiosk_profile_loader_;
   scoped_ptr<StartupAppLauncher> startup_app_launcher_;
   scoped_ptr<AppLaunchSigninScreen> signin_screen_;
@@ -123,7 +131,8 @@ class AppLaunchController
   static bool skip_splash_wait_;
   static int network_wait_time_;
   static base::Closure* network_timeout_callback_;
-  static CanConfigureNetworkCallback* can_configure_network_callback_;
+  static ReturnBoolCallback* can_configure_network_callback_;
+  static ReturnBoolCallback* need_owner_auth_to_configure_network_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(AppLaunchController);
 };