chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.cc - Issue 872633008: Migrate (Network)ErrorScreen to ScreenContext

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.cc

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

« no previous file with comments | « chrome/browser/chromeos/login/screens/update_screen_browsertest.cc ('k') | chrome/browser/chromeos/login/ui/captive_portal_window_browsertest.cc » ('j') | chrome/browser/ui/webui/chromeos/login/error_screen_handler.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.cc

diff --git a/chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.cc b/chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.cc

index e12b6678b39270afd3a31db3bf52863378d89864..2ffad5ee6dd400a5d94697679a8f8b67acda8b32 100644

--- a/chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.cc

+++ b/chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.cc

@@ -14,6 +14,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/signin_specifics.h"

#include "chrome/browser/chromeos/login/supervised/supervised_user_authentication.h"

#include "chrome/browser/chromeos/login/supervised/supervised_user_creation_controller.h"

@@ -70,17 +71,15 @@ void ConfigureErrorScreen(ErrorScreen* screen,

NOTREACHED();

break;

case NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_OFFLINE:

- screen->SetErrorState(ErrorScreen::ERROR_STATE_OFFLINE,

- std::string());

+ screen->SetErrorState(NetworkError::ERROR_STATE_OFFLINE, std::string());

break;

case NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PORTAL:

- screen->SetErrorState(ErrorScreen::ERROR_STATE_PORTAL,

+ screen->SetErrorState(NetworkError::ERROR_STATE_PORTAL,

network ? network->name() : std::string());

screen->FixCaptivePortal();

break;

case NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PROXY_AUTH_REQUIRED:

- screen->SetErrorState(ErrorScreen::ERROR_STATE_PROXY,

- std::string());

+ screen->SetErrorState(NetworkError::ERROR_STATE_PROXY, std::string());

break;

default:

NOTREACHED();

@@ -164,7 +163,7 @@ void SupervisedUserCreationScreen::OnPortalDetectionCompleted(

on_error_screen_ = true;

ErrorScreen* screen = get_base_screen_delegate()->GetErrorScreen();

ConfigureErrorScreen(screen, network, state.status);

- screen->SetUIState(ErrorScreen::UI_STATE_SUPERVISED);

+ screen->SetUIState(NetworkError::UI_STATE_SUPERVISED);

get_base_screen_delegate()->ShowErrorScreen();

histogram_helper_->OnErrorShow(screen->GetErrorState());

}