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

Unified Diff: chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc

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/gaia_screen_handler.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc
index a6678216f8e137c6251dbaa2bc4a0bc5d875aee4..30dc91e701d5fdcc100d89b68e5e59d46e30f23e 100644
--- a/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc
@@ -14,6 +14,7 @@
#include "chrome/browser/browser_shutdown.h"
#include "chrome/browser/chromeos/input_method/input_method_util.h"
#include "chrome/browser/chromeos/language_preferences.h"
+#include "chrome/browser/chromeos/login/screens/network_error.h"
#include "chrome/browser/chromeos/login/startup_utils.h"
#include "chrome/browser/chromeos/login/ui/user_adding_screen.h"
#include "chrome/browser/chromeos/login/users/chrome_user_manager.h"
@@ -29,6 +30,7 @@
#include "chrome/common/pref_names.h"
#include "chrome/grit/generated_resources.h"
#include "chromeos/chromeos_switches.h"
+#include "chromeos/login/auth/user_context.h"
#include "chromeos/settings/cros_settings_names.h"
#include "components/user_manager/user_manager.h"
#include "content/public/browser/browser_thread.h"
@@ -346,9 +348,9 @@ void GaiaScreenHandler::HandleFrameLoadingCompleted(int status) {
if (network_state_informer_->state() != NetworkStateInformer::ONLINE)
return;
if (frame_state_ == FRAME_STATE_LOADED)
- UpdateState(ErrorScreenActor::ERROR_REASON_UPDATE);
+ UpdateState(NetworkError::ERROR_REASON_UPDATE);
else if (frame_state_ == FRAME_STATE_ERROR)
- UpdateState(ErrorScreenActor::ERROR_REASON_FRAME_ERROR);
+ UpdateState(NetworkError::ERROR_REASON_FRAME_ERROR);
}
void GaiaScreenHandler::HandleCompleteAuthentication(
@@ -695,7 +697,7 @@ void GaiaScreenHandler::ShowGaiaScreenIfReady() {
if (focus_stolen_)
HandleGaiaUIReady();
}
- signin_screen_handler_->UpdateState(ErrorScreenActor::ERROR_REASON_UPDATE);
+ signin_screen_handler_->UpdateState(NetworkError::ERROR_REASON_UPDATE);
if (core_oobe_actor_) {
PrefService* prefs = g_browser_process->local_state();
@@ -749,7 +751,7 @@ void GaiaScreenHandler::LoadAuthExtension(bool force,
LoadGaia(context);
}
-void GaiaScreenHandler::UpdateState(ErrorScreenActor::ErrorReason reason) {
+void GaiaScreenHandler::UpdateState(NetworkError::ErrorReason reason) {
if (signin_screen_handler_)
signin_screen_handler_->UpdateState(reason);
}

Powered by Google App Engine
This is Rietveld 408576698