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

Unified Diff: chrome/browser/chromeos/login/screens/update_screen.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/chromeos/login/screens/update_screen.cc
diff --git a/chrome/browser/chromeos/login/screens/update_screen.cc b/chrome/browser/chromeos/login/screens/update_screen.cc
index 045742154919ee5f31853f5dd822bbec2ae2708a..ed55bd2f0a66fd20bfc3556034e4a35f82074dc2 100644
--- a/chrome/browser/chromeos/login/screens/update_screen.cc
+++ b/chrome/browser/chromeos/login/screens/update_screen.cc
@@ -15,6 +15,7 @@
#include "chrome/browser/chromeos/login/screen_manager.h"
#include "chrome/browser/chromeos/login/screens/base_screen_delegate.h"
#include "chrome/browser/chromeos/login/screens/error_screen.h"
+#include "chrome/browser/chromeos/login/screens/network_error.h"
#include "chrome/browser/chromeos/login/screens/update_view.h"
#include "chrome/browser/chromeos/login/startup_utils.h"
#include "chrome/browser/chromeos/login/wizard_controller.h"
@@ -519,9 +520,9 @@ void UpdateScreen::StartUpdateCheck() {
void UpdateScreen::ShowErrorMessage() {
LOG(WARNING) << "UpdateScreen::ShowErrorMessage()";
state_ = STATE_ERROR;
- GetErrorScreen()->SetUIState(ErrorScreen::UI_STATE_UPDATE);
+ GetErrorScreen()->SetUIState(NetworkError::UI_STATE_UPDATE);
get_base_screen_delegate()->ShowErrorScreen();
- histogram_helper_->OnErrorShow(GetErrorScreen()->GetErrorState());
+ histogram_helper_->OnErrorShow(GetErrorScreen()->error_state());
}
void UpdateScreen::HideErrorMessage() {
@@ -539,12 +540,12 @@ void UpdateScreen::UpdateErrorMessage(
break;
case NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_UNKNOWN:
case NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_OFFLINE:
- GetErrorScreen()->SetErrorState(ErrorScreen::ERROR_STATE_OFFLINE,
+ GetErrorScreen()->SetErrorState(NetworkError::ERROR_STATE_OFFLINE,
std::string());
break;
case NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PORTAL:
DCHECK(network);
- GetErrorScreen()->SetErrorState(ErrorScreen::ERROR_STATE_PORTAL,
+ GetErrorScreen()->SetErrorState(NetworkError::ERROR_STATE_PORTAL,
network->name());
if (is_first_portal_notification_) {
is_first_portal_notification_ = false;
@@ -552,7 +553,7 @@ void UpdateScreen::UpdateErrorMessage(
}
break;
case NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PROXY_AUTH_REQUIRED:
- GetErrorScreen()->SetErrorState(ErrorScreen::ERROR_STATE_PROXY,
+ GetErrorScreen()->SetErrorState(NetworkError::ERROR_STATE_PROXY,
std::string());
break;
default:

Powered by Google App Engine
This is Rietveld 408576698