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

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

Issue 872633008: Migrate (Network)ErrorScreen to ScreenContext (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: cleanup Created 5 years, 10 months 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 5e3c945a87d7b5321f48defa89790b4949da09b7..401718c00c3bb27ee8c0fad0d3f6a4edb7894717 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
@@ -9,6 +9,7 @@
#include <string>
#include "chrome/browser/chromeos/login/screens/app_launch_splash_screen_actor.h"
+#include "chrome/browser/chromeos/login/screens/network_error_model.h"
#include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h"
#include "chrome/browser/ui/webui/chromeos/login/network_state_informer.h"
@@ -24,7 +25,7 @@ class AppLaunchSplashScreenHandler
public:
AppLaunchSplashScreenHandler(
const scoped_refptr<NetworkStateInformer>& network_state_informer,
- ErrorScreenActor* error_screen_actor);
+ NetworkErrorModel* network_error_model);
~AppLaunchSplashScreenHandler() override;
// BaseScreenHandler implementation:
@@ -46,7 +47,7 @@ class AppLaunchSplashScreenHandler
// NetworkStateInformer::NetworkStateInformerObserver implementation:
void OnNetworkReady() override;
- void UpdateState(ErrorScreenActor::ErrorReason reason) override;
+ void UpdateState(NetworkError::ErrorReason reason) override;
private:
void PopulateAppInfo(base::DictionaryValue* out_info);
@@ -63,11 +64,14 @@ class AppLaunchSplashScreenHandler
AppLaunchState state_;
scoped_refptr<NetworkStateInformer> network_state_informer_;
- ErrorScreenActor* error_screen_actor_;
+ NetworkErrorModel* network_error_model_;
+
// True if we are online.
bool online_state_;
+
// True if we have network config screen was already shown before.
bool network_config_done_;
+
// True if we have manually requested network config screen.
bool network_config_requested_;

Powered by Google App Engine
This is Rietveld 408576698