chrome/browser/ui/webui/chromeos/login/app_launch_splash_screen_handler.cc - Issue 2429033003: cros: Cleanup lock screen and OOBE C++ backing code.

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/ui/webui/chromeos/login/app_launch_splash_screen_handler.cc

Issue 2429033003: cros: Cleanup lock screen and OOBE C++ backing code. (Closed)

Patch Set: Address comments Created 4 years, 2 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/shutdown_policy_browsertest.cc ('k') | chrome/browser/ui/webui/chromeos/login/base_screen_handler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/chromeos/login/app_launch_splash_screen_handler.cc

diff --git a/chrome/browser/ui/webui/chromeos/login/app_launch_splash_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/app_launch_splash_screen_handler.cc

index 0c660c4d0992b675f4a51fcce1dae0cb5d814746..0655457d2a1d6e2d145a17353cb18e52b75f03a3 100644

--- a/chrome/browser/ui/webui/chromeos/login/app_launch_splash_screen_handler.cc

+++ b/chrome/browser/ui/webui/chromeos/login/app_launch_splash_screen_handler.cc

@@ -184,12 +184,7 @@ void AppLaunchSplashScreenHandler::ShowNetworkConfigureUI() {

break;

}

- OobeScreen screen = OobeScreen::SCREEN_UNKNOWN;

- OobeUI* oobe_ui = static_cast<OobeUI*>(web_ui()->GetController());

- if (oobe_ui)

- screen = oobe_ui->current_screen();

- if (screen != OobeScreen::SCREEN_ERROR_MESSAGE)

+ if (GetCurrentScreen() != OobeScreen::SCREEN_ERROR_MESSAGE)

network_error_model_->SetParentScreen(OobeScreen::SCREEN_APP_LAUNCH_SPLASH);

network_error_model_->Show();

}