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

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

Issue 872633008: Migrate (Network)ErrorScreen to ScreenContext (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nit 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/enrollment_screen_handler.h
diff --git a/chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.h
index 0ef04e7ad475f023184eaabc81a03843b46abc05..a2e36006e00cd23357dddb1527552ea462ec7413 100644
--- a/chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.h
+++ b/chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.h
@@ -12,12 +12,13 @@
#include "base/memory/scoped_vector.h"
#include "chrome/browser/chromeos/login/enrollment/enrollment_screen_actor.h"
#include "chrome/browser/chromeos/login/enrollment/enterprise_enrollment_helper.h"
-#include "chrome/browser/chromeos/login/screens/error_screen_actor.h"
+#include "chrome/browser/chromeos/login/screens/network_error_model.h"
#include "chrome/browser/chromeos/login/ui/webui_login_view.h"
#include "chrome/browser/chromeos/policy/enrollment_config.h"
#include "chrome/browser/extensions/signin/scoped_gaia_auth_extension.h"
#include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h"
#include "chrome/browser/ui/webui/chromeos/login/network_state_informer.h"
+#include "net/base/net_errors.h"
namespace chromeos {
@@ -33,7 +34,7 @@ class EnrollmentScreenHandler
public:
EnrollmentScreenHandler(
const scoped_refptr<NetworkStateInformer>& network_state_informer,
- ErrorScreenActor* error_screen_actor);
+ NetworkErrorModel* network_error_model);
~EnrollmentScreenHandler() override;
// Implements WebUIMessageHandler:
@@ -58,7 +59,7 @@ class EnrollmentScreenHandler
::login::LocalizedValuesBuilder* builder) override;
// Implements NetworkStateInformer::NetworkStateInformerObserver
- void UpdateState(ErrorScreenActor::ErrorReason reason) override;
+ void UpdateState(NetworkError::ErrorReason reason) override;
// Implements WebUILoginView::FrameObserver
void OnFrameError(const std::string& frame_unique_name) override;
@@ -70,12 +71,11 @@ class EnrollmentScreenHandler
void HandleRetry();
void HandleFrameLoadingCompleted(int status);
- void UpdateStateInternal(ErrorScreenActor::ErrorReason reason,
- bool force_update);
+ void UpdateStateInternal(NetworkError::ErrorReason reason, bool force_update);
void SetupAndShowOfflineMessage(NetworkStateInformer::State state,
- ErrorScreenActor::ErrorReason reason);
+ NetworkError::ErrorReason reason);
void HideOfflineMessage(NetworkStateInformer::State state,
- ErrorScreenActor::ErrorReason reason);
+ NetworkError::ErrorReason reason);
net::Error frame_error() const { return frame_error_; }
// Shows a given enrollment step.
@@ -127,7 +127,7 @@ class EnrollmentScreenHandler
// Network state informer used to keep signin screen up.
scoped_refptr<NetworkStateInformer> network_state_informer_;
- ErrorScreenActor* error_screen_actor_;
+ NetworkErrorModel* network_error_model_;
scoped_ptr<ErrorScreensHistogramHelper> histogram_helper_;

Powered by Google App Engine
This is Rietveld 408576698