Commit 2cdc221a authored by Anatoliy Potapchuk's avatar Anatoliy Potapchuk Committed by Commit Bot

[Kiosk] Remove unnsessesary duplications in LoginDisplayHost

Function calls in OnStart{Web|Arc}Kiosk are identical to
OnStartAppLaunch. Let's remove them.

Bug: 1043663
Change-Id: I9f748f4d32374eb9cc622dd6ca80e8375c29c745
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2011838
Commit-Queue: Anatoliy Potapchuk <apotapchuk@chromium.org>
Reviewed-by: default avatarRoman Sorokin [CET] <rsorokin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#733961}
parent 35da0015
...@@ -172,7 +172,7 @@ void LoginDisplayHostCommon::StartArcKiosk(const AccountId& account_id) { ...@@ -172,7 +172,7 @@ void LoginDisplayHostCommon::StartArcKiosk(const AccountId& account_id) {
std::make_unique<ArcKioskController>(this, GetOobeUI()); std::make_unique<ArcKioskController>(this, GetOobeUI());
arc_kiosk_controller_->StartArcKiosk(account_id); arc_kiosk_controller_->StartArcKiosk(account_id);
OnStartArcKiosk(); OnStartAppLaunch();
} }
void LoginDisplayHostCommon::StartWebKiosk(const AccountId& account_id) { void LoginDisplayHostCommon::StartWebKiosk(const AccountId& account_id) {
...@@ -200,7 +200,7 @@ void LoginDisplayHostCommon::StartWebKiosk(const AccountId& account_id) { ...@@ -200,7 +200,7 @@ void LoginDisplayHostCommon::StartWebKiosk(const AccountId& account_id) {
// shown by the DeviceDisablingManager. // shown by the DeviceDisablingManager.
return; return;
} }
OnStartWebKiosk(); OnStartAppLaunch();
web_kiosk_controller_ = web_kiosk_controller_ =
std::make_unique<WebKioskController>(this, GetOobeUI()); std::make_unique<WebKioskController>(this, GetOobeUI());
......
...@@ -70,8 +70,6 @@ class LoginDisplayHostCommon : public LoginDisplayHost, ...@@ -70,8 +70,6 @@ class LoginDisplayHostCommon : public LoginDisplayHost,
protected: protected:
virtual void OnStartSignInScreen(const LoginScreenContext& context) = 0; virtual void OnStartSignInScreen(const LoginScreenContext& context) = 0;
virtual void OnStartAppLaunch() = 0; virtual void OnStartAppLaunch() = 0;
virtual void OnStartArcKiosk() = 0;
virtual void OnStartWebKiosk() = 0;
virtual void OnBrowserCreated() = 0; virtual void OnBrowserCreated() = 0;
virtual void OnStartUserAdding() = 0; virtual void OnStartUserAdding() = 0;
virtual void OnFinalize() = 0; virtual void OnFinalize() = 0;
......
...@@ -250,14 +250,6 @@ void LoginDisplayHostMojo::OnStartAppLaunch() { ...@@ -250,14 +250,6 @@ void LoginDisplayHostMojo::OnStartAppLaunch() {
ShowFullScreen(); ShowFullScreen();
} }
void LoginDisplayHostMojo::OnStartArcKiosk() {
ShowFullScreen();
}
void LoginDisplayHostMojo::OnStartWebKiosk() {
ShowFullScreen();
}
void LoginDisplayHostMojo::OnBrowserCreated() { void LoginDisplayHostMojo::OnBrowserCreated() {
NOTIMPLEMENTED(); NOTIMPLEMENTED();
} }
......
...@@ -82,8 +82,6 @@ class LoginDisplayHostMojo : public LoginDisplayHostCommon, ...@@ -82,8 +82,6 @@ class LoginDisplayHostMojo : public LoginDisplayHostCommon,
void OnStartSignInScreen(const LoginScreenContext& context) override; void OnStartSignInScreen(const LoginScreenContext& context) override;
void OnPreferencesChanged() override; void OnPreferencesChanged() override;
void OnStartAppLaunch() override; void OnStartAppLaunch() override;
void OnStartArcKiosk() override;
void OnStartWebKiosk() override;
void OnBrowserCreated() override; void OnBrowserCreated() override;
void ShowGaiaDialog(bool can_close, void ShowGaiaDialog(bool can_close,
const AccountId& prefilled_account) override; const AccountId& prefilled_account) override;
......
...@@ -650,24 +650,6 @@ void LoginDisplayHostWebUI::OnStartAppLaunch() { ...@@ -650,24 +650,6 @@ void LoginDisplayHostWebUI::OnStartAppLaunch() {
login_view_->set_should_emit_login_prompt_visible(false); login_view_->set_should_emit_login_prompt_visible(false);
} }
void LoginDisplayHostWebUI::OnStartArcKiosk() {
finalize_animation_type_ = ANIMATION_FADE_OUT;
if (!login_window_) {
LoadURL(GURL(kAppLaunchSplashURL));
}
login_view_->set_should_emit_login_prompt_visible(false);
}
void LoginDisplayHostWebUI::OnStartWebKiosk() {
finalize_animation_type_ = ANIMATION_FADE_OUT;
if (!login_window_) {
LoadURL(GURL(kAppLaunchSplashURL));
}
login_view_->set_should_emit_login_prompt_visible(false);
}
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// LoginDisplayHostWebUI, public // LoginDisplayHostWebUI, public
......
...@@ -79,8 +79,6 @@ class LoginDisplayHostWebUI : public LoginDisplayHostCommon, ...@@ -79,8 +79,6 @@ class LoginDisplayHostWebUI : public LoginDisplayHostCommon,
void OnStartSignInScreen(const LoginScreenContext& context) override; void OnStartSignInScreen(const LoginScreenContext& context) override;
void OnPreferencesChanged() override; void OnPreferencesChanged() override;
void OnStartAppLaunch() override; void OnStartAppLaunch() override;
void OnStartArcKiosk() override;
void OnStartWebKiosk() override;
void OnBrowserCreated() override; void OnBrowserCreated() override;
void ShowGaiaDialog(bool can_close, void ShowGaiaDialog(bool can_close,
const AccountId& prefilled_account) override; const AccountId& prefilled_account) override;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment