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

Unified Diff: chrome/browser/ui/webui/chromeos/login/signin_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/signin_screen_handler.h
diff --git a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h
index 43f43a7992355b89121535820d55a68a31c096d5..60809afb6dec68e2601206f47b521ce667dcb359 100644
--- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h
+++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h
@@ -17,7 +17,7 @@
#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/memory/weak_ptr.h"
-#include "chrome/browser/chromeos/login/screens/network_error_model.h"
+#include "chrome/browser/chromeos/login/screens/error_screen.h"
#include "chrome/browser/chromeos/login/signin_specifics.h"
#include "chrome/browser/chromeos/login/ui/login_display.h"
#include "chrome/browser/chromeos/settings/cros_settings.h"
@@ -223,7 +223,7 @@ class SigninScreenHandler
public:
SigninScreenHandler(
const scoped_refptr<NetworkStateInformer>& network_state_informer,
- NetworkErrorModel* network_error_model,
+ ErrorScreen* error_screen,
CoreOobeActor* core_oobe_actor,
GaiaScreenHandler* gaia_screen_handler);
~SigninScreenHandler() override;
@@ -456,8 +456,8 @@ class SigninScreenHandler
bool webui_visible_ = false;
bool preferences_changed_delayed_ = false;
- NetworkErrorModel* network_error_model_;
- CoreOobeActor* core_oobe_actor_;
+ ErrorScreen* error_screen_ = nullptr;
+ CoreOobeActor* core_oobe_actor_ = nullptr;
NetworkStateInformer::State last_network_state_ =
NetworkStateInformer::UNKNOWN;
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/oobe_ui.cc ('k') | chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698