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

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

Issue 2713513009: cros: Break BaseScreenHandler into two classes. (Closed)
Patch Set: Add comments, fix compile Created 3 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/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 5dcdd4fcb997ecbd85e98e1ec3268b46a6f8aa37..865ceac8d9f29b416167cc64049ea7cef77968ea 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
@@ -39,7 +39,8 @@ namespace chromeos {
AppLaunchSplashScreenHandler::AppLaunchSplashScreenHandler(
const scoped_refptr<NetworkStateInformer>& network_state_informer,
ErrorScreen* error_screen)
- : network_state_informer_(network_state_informer),
+ : BaseScreenHandler(kScreenId),
+ network_state_informer_(network_state_informer),
error_screen_(error_screen) {
set_call_js_prefix(kJsScreenPath);
network_state_informer_->AddObserver(this);
@@ -90,7 +91,7 @@ void AppLaunchSplashScreenHandler::Show(const std::string& app_id) {
data.Set("appInfo", app_info);
SetLaunchText(l10n_util::GetStringUTF8(GetProgressMessageFromState(state_)));
- ShowScreenWithData(OobeScreen::SCREEN_APP_LAUNCH_SPLASH, &data);
+ ShowScreenWithData(kScreenId, &data);
}
void AppLaunchSplashScreenHandler::RegisterMessages() {
@@ -176,7 +177,7 @@ void AppLaunchSplashScreenHandler::ShowNetworkConfigureUI() {
}
if (GetCurrentScreen() != OobeScreen::SCREEN_ERROR_MESSAGE)
- error_screen_->SetParentScreen(OobeScreen::SCREEN_APP_LAUNCH_SPLASH);
+ error_screen_->SetParentScreen(kScreenId);
error_screen_->Show();
}
« no previous file with comments | « chrome/browser/ui/BUILD.gn ('k') | chrome/browser/ui/webui/chromeos/login/arc_kiosk_splash_screen_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698