Commit 601da7ee authored by Quan Nguyen's avatar Quan Nguyen Committed by Commit Bot

cros: Show Account Access help app in its own window instead of OOBE dialog's.

This also fixes the crash when we click on the "Learn More" button in views lock screen.

Bug: 872699, 872692
Change-Id: I3172cae0a9a86e28a6f154eb000e270eaf9352dd
Reviewed-on: https://chromium-review.googlesource.com/1169764
Commit-Queue: Quan Nguyen <qnnguyen@chromium.org>
Reviewed-by: default avatarJacob Dufault <jdufault@chromium.org>
Reviewed-by: default avatarXiyuan Xia <xiyuan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#582241}
parent 5eeadd14
......@@ -142,8 +142,6 @@ void FakeLoginDisplayHost::ShowFeedback() {}
void FakeLoginDisplayHost::ShowResetScreen() {}
void FakeLoginDisplayHost::ShowAccountAccessHelpApp() {}
void FakeLoginDisplayHost::ShowDialogForCaptivePortal() {}
void FakeLoginDisplayHost::HideDialogForCaptivePortal() {}
......
......@@ -66,7 +66,6 @@ class FakeLoginDisplayHost : public LoginDisplayHost {
void ResyncUserData() override;
void ShowFeedback() override;
void ShowResetScreen() override;
void ShowAccountAccessHelpApp() override;
void ShowDialogForCaptivePortal() override;
void HideDialogForCaptivePortal() override;
void UpdateAddUserButtonStatus() override;
......
......@@ -197,9 +197,6 @@ class LoginDisplayHost {
// Shows the powerwash dialog.
virtual void ShowResetScreen() = 0;
// Start up the help application for trouble signin in.
virtual void ShowAccountAccessHelpApp() = 0;
// In the views case, make the OobeUIDialogDelegate visible so that Captive
// Portal web modal can be seen. In webui login, this should be a no-op.
virtual void ShowDialogForCaptivePortal() = 0;
......
......@@ -317,12 +317,6 @@ void LoginDisplayHostMojo::ShowResetScreen() {
GetOobeUI()->ForwardAccelerator(kAccelReset);
}
void LoginDisplayHostMojo::ShowAccountAccessHelpApp() {
scoped_refptr<HelpAppLauncher>(new HelpAppLauncher(GetNativeWindow()))
->ShowHelpTopic(HelpAppLauncher::HELP_CANT_ACCESS_ACCOUNT);
dialog_->Show();
}
void LoginDisplayHostMojo::UpdateAddUserButtonStatus() {
DCHECK(GetOobeUI());
LoginScreenClient::Get()->login_screen()->SetAddUserButtonEnabled(
......
......@@ -93,7 +93,6 @@ class LoginDisplayHostMojo : public LoginDisplayHostCommon,
void OnCancelPasswordChangedFlow() override;
void ShowFeedback() override;
void ShowResetScreen() override;
void ShowAccountAccessHelpApp() override;
void ShowDialogForCaptivePortal() override;
void HideDialogForCaptivePortal() override;
void UpdateAddUserButtonStatus() override;
......
......@@ -1177,10 +1177,6 @@ void LoginDisplayHostWebUI::ShowResetScreen() {
NOTREACHED();
}
void LoginDisplayHostWebUI::ShowAccountAccessHelpApp() {
NOTREACHED();
}
// This is handled differently in webui.
void LoginDisplayHostWebUI::ShowDialogForCaptivePortal() {}
......
......@@ -81,7 +81,6 @@ class LoginDisplayHostWebUI : public LoginDisplayHostCommon,
const user_manager::UserList GetUsers() override;
void ShowFeedback() override;
void ShowResetScreen() override;
void ShowAccountAccessHelpApp() override;
void ShowDialogForCaptivePortal() override;
void HideDialogForCaptivePortal() override;
void UpdateAddUserButtonStatus() override;
......
......@@ -7,6 +7,7 @@
#include <utility>
#include "ash/public/interfaces/constants.mojom.h"
#include "chrome/browser/chromeos/login/help_app_launcher.h"
#include "chrome/browser/chromeos/login/lock/screen_locker.h"
#include "chrome/browser/chromeos/login/login_auth_recorder.h"
#include "chrome/browser/chromeos/login/reauth_stats.h"
......@@ -181,7 +182,9 @@ void LoginScreenClient::ShowResetScreen() {
}
void LoginScreenClient::ShowAccountAccessHelpApp() {
chromeos::LoginDisplayHost::default_host()->ShowAccountAccessHelpApp();
scoped_refptr<chromeos::HelpAppLauncher>(
new chromeos::HelpAppLauncher(nullptr))
->ShowHelpTopic(chromeos::HelpAppLauncher::HELP_CANT_ACCESS_ACCOUNT);
}
void LoginScreenClient::LoadWallpaper(const AccountId& account_id) {
......
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