Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8224)

Unified Diff: chrome/browser/ui/webui/chromeos/login/app_launch_splash_screen_handler.h

Issue 79113002: kiosk: Network connectivity test during launch. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/chromeos/login/app_launch_splash_screen_handler.h
diff --git a/chrome/browser/ui/webui/chromeos/login/app_launch_splash_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/app_launch_splash_screen_handler.h
index 72cc4b77fc045d0795a7149912243538bc6a9f86..f2c10b5f5b1dd1f4f9e7228f850d961fae9e3811 100644
--- a/chrome/browser/ui/webui/chromeos/login/app_launch_splash_screen_handler.h
+++ b/chrome/browser/ui/webui/chromeos/login/app_launch_splash_screen_handler.h
@@ -10,14 +10,21 @@
#include "chrome/browser/chromeos/login/screens/app_launch_splash_screen_actor.h"
#include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h"
+#include "chrome/browser/ui/webui/chromeos/login/network_state_informer.h"
namespace chromeos {
+class ErrorScreenActor;
+
// A class that handles the WebUI hooks for the app launch splash screen.
-class AppLaunchSplashScreenHandler : public BaseScreenHandler,
- public AppLaunchSplashScreenActor {
+class AppLaunchSplashScreenHandler
+ : public BaseScreenHandler,
+ public AppLaunchSplashScreenActor,
+ public NetworkStateInformer::NetworkStateInformerObserver {
public:
- AppLaunchSplashScreenHandler();
+ AppLaunchSplashScreenHandler(
+ const scoped_refptr<NetworkStateInformer>& network_state_informer,
+ ErrorScreenActor* error_screen_actor);
virtual ~AppLaunchSplashScreenHandler();
// BaseScreenHandler implementation:
@@ -35,6 +42,11 @@ class AppLaunchSplashScreenHandler : public BaseScreenHandler,
virtual void UpdateAppLaunchState(AppLaunchState state) OVERRIDE;
virtual void SetDelegate(
AppLaunchSplashScreenHandler::Delegate* delegate) OVERRIDE;
+ virtual void ShowNetworkConfigureUI() OVERRIDE;
+
+ // NetworkStateInformer::NetworkStateInformerObserver implementation:
+ virtual void OnNetworkReady() OVERRIDE;
+ virtual void UpdateState(ErrorScreenActor::ErrorReason reason) OVERRIDE;
private:
void PopulateAppInfo(base::DictionaryValue* out_info);
@@ -48,6 +60,9 @@ class AppLaunchSplashScreenHandler : public BaseScreenHandler,
std::string app_id_;
AppLaunchState state_;
+ scoped_refptr<NetworkStateInformer> network_state_informer_;
+ ErrorScreenActor* error_screen_actor_;
+
DISALLOW_COPY_AND_ASSIGN(AppLaunchSplashScreenHandler);
};

Powered by Google App Engine
This is Rietveld 408576698