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

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

Issue 2642823011: cros: Fold NetworkErrorModel into NetworkErrorView. (Closed)
Patch Set: Address comments Created 3 years, 11 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 40f68b700f089d6c8ef3d6911cf55aa4976c9f85..8cabf780b2b5f98e601ba973ecdba528c44ba919 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,7 +10,7 @@
#include "base/macros.h"
#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/chromeos/login/screens/error_screen.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 +24,7 @@ class AppLaunchSplashScreenHandler
public:
AppLaunchSplashScreenHandler(
const scoped_refptr<NetworkStateInformer>& network_state_informer,
- NetworkErrorModel* network_error_model);
+ ErrorScreen* error_screen);
~AppLaunchSplashScreenHandler() override;
// BaseScreenHandler implementation:
@@ -57,22 +57,22 @@ class AppLaunchSplashScreenHandler
void HandleContinueAppLaunch();
void HandleNetworkConfigRequested();
- AppLaunchSplashScreenHandler::Delegate* delegate_;
- bool show_on_init_;
+ AppLaunchSplashScreenHandler::Delegate* delegate_ = nullptr;
+ bool show_on_init_ = false;
std::string app_id_;
- AppLaunchState state_;
+ AppLaunchState state_ = APP_LAUNCH_STATE_LOADING_AUTH_FILE;
scoped_refptr<NetworkStateInformer> network_state_informer_;
- NetworkErrorModel* network_error_model_;
+ ErrorScreen* error_screen_;
// True if we are online.
- bool online_state_;
+ bool online_state_ = false;
// True if we have network config screen was already shown before.
- bool network_config_done_;
+ bool network_config_done_ = false;
// True if we have manually requested network config screen.
- bool network_config_requested_;
+ bool network_config_requested_ = false;
DISALLOW_COPY_AND_ASSIGN(AppLaunchSplashScreenHandler);
};

Powered by Google App Engine
This is Rietveld 408576698