cros: Propagate parent window for GetHelp App on the lock screen

Fixed: 1022774
Change-Id: I2ffc80512230316cc3b94b70e7e11f6b2db0390e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2010950Reviewed-by: Denis Kuznetsov [CET] <antrim@chromium.org>
Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Commit-Queue: Roman Sorokin [CET] <rsorokin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#734377}

ash/login/login_screen_controller.cc

@@ -446,12 +446,14 @@ void LoginScreenController::ShowResetScreen() {
   client_->ShowResetScreen();
 }
 
-void LoginScreenController::ShowAccountAccessHelpApp() {
-  client_->ShowAccountAccessHelpApp();
+void LoginScreenController::ShowAccountAccessHelpApp(
+    gfx::NativeWindow parent_window) {
+  client_->ShowAccountAccessHelpApp(parent_window);
 }
 
-void LoginScreenController::ShowParentAccessHelpApp() {
-  client_->ShowParentAccessHelpApp();
+void LoginScreenController::ShowParentAccessHelpApp(
+    gfx::NativeWindow parent_window) {
+  client_->ShowParentAccessHelpApp(parent_window);
 }
 
 void LoginScreenController::ShowLockScreenNotificationSettings() {

ash/login/login_screen_controller.h

@@ -16,6 +16,7 @@
 #include "base/macros.h"
 #include "base/optional.h"
 #include "base/time/time.h"
+#include "ui/gfx/native_widget_types.h"
 
 class PrefRegistrySimple;
 
@@ -91,8 +92,8 @@ class ASH_EXPORT LoginScreenController : public LoginScreen,
                                            const std::string& locale);
   void ShowFeedback();
   void ShowResetScreen();
-  void ShowAccountAccessHelpApp();
-  void ShowParentAccessHelpApp();
+  void ShowAccountAccessHelpApp(gfx::NativeWindow parent_window);
+  void ShowParentAccessHelpApp(gfx::NativeWindow parent_window);
   void ShowLockScreenNotificationSettings();
   void FocusOobeDialog();
   void NotifyUserActivity();

ash/login/mock_login_screen_client.h

@@ -119,8 +119,8 @@ class MockLoginScreenClient : public LoginScreenClient {
               (override));
   MOCK_METHOD(void, ShowFeedback, (), (override));
   MOCK_METHOD(void, ShowResetScreen, (), (override));
-  MOCK_METHOD(void, ShowAccountAccessHelpApp, (), (override));
-  MOCK_METHOD(void, ShowParentAccessHelpApp, (), (override));
+  MOCK_METHOD(void, ShowAccountAccessHelpApp, (gfx::NativeWindow), (override));
+  MOCK_METHOD(void, ShowParentAccessHelpApp, (gfx::NativeWindow), (override));
   MOCK_METHOD(void, ShowLockScreenNotificationSettings, (), (override));
   MOCK_METHOD(void, FocusOobeDialog, (), (override));
   MOCK_METHOD(void, OnFocusLeavingSystemTray, (bool reverse), (override));

ash/login/ui/lock_contents_view.cc

@@ -148,7 +148,8 @@ class AuthErrorLearnMoreButton : public views::Button,
   }
 
   void ButtonPressed(Button* sender, const ui::Event& event) override {
-    Shell::Get()->login_screen_controller()->ShowAccountAccessHelpApp();
+    Shell::Get()->login_screen_controller()->ShowAccountAccessHelpApp(
+        GetWidget()->GetNativeWindow());
     parent_bubble_->Hide();
   }
 

ash/login/ui/lock_contents_view_unittest.cc

@@ -991,6 +991,7 @@ TEST_F(LockContentsViewUnitTest, AuthErrorButtonClickable) {
       DataDispatcher(),
       std::make_unique<FakeLoginDetachableBaseModel>(DataDispatcher()));
   SetUserCount(1);
+
   SetWidget(CreateWidgetWithContent(contents));
 
   LockContentsView::TestApi test_api(contents);
@@ -1018,7 +1019,8 @@ TEST_F(LockContentsViewUnitTest, AuthErrorButtonClickable) {
   ASSERT_TRUE(button);
 
   // Expect ShowAccountAccessHelp() to be called due to button click.
-  EXPECT_CALL(*client, ShowAccountAccessHelpApp()).Times(1);
+  EXPECT_CALL(*client, ShowAccountAccessHelpApp(widget()->GetNativeWindow()))
+      .Times(1);
 
   // Move mouse to AuthError's ShowAccountAccessHelp button and click it.
   // Should result in ShowAccountAccessHelpApp().

ash/login/ui/parent_access_view.cc

@@ -805,9 +805,13 @@ void ParentAccessView::ButtonPressed(views::Button* sender,
     // TODO(https://crbug.com/999387): Remove this when handling touch
     // cancellation is fixed for system modal windows.
     base::ThreadTaskRunnerHandle::Get()->PostTask(
-        FROM_HERE, base::BindOnce([]() {
-          Shell::Get()->login_screen_controller()->ShowParentAccessHelpApp();
-        }));
+        FROM_HERE,
+        base::BindOnce(
+            [](gfx::NativeWindow parent_window) {
+              Shell::Get()->login_screen_controller()->ShowParentAccessHelpApp(
+                  parent_window);
+            },
+            GetWidget()->GetNativeWindow()));
   } else if (sender == submit_button_) {
     SubmitCode();
   }

ash/login/ui/parent_access_view_unittest.cc

@@ -280,7 +280,8 @@ TEST_F(ParentAccessViewTest, HelpButton) {
   ParentAccessView::TestApi test_api(view_);
   EXPECT_TRUE(test_api.help_button()->GetEnabled());
 
-  EXPECT_CALL(*client, ShowParentAccessHelpApp()).Times(1);
+  EXPECT_CALL(*client, ShowParentAccessHelpApp(widget()->GetNativeWindow()))
+      .Times(1);
   SimulateButtonPress(test_api.help_button());
   base::RunLoop().RunUntilIdle();
 

ash/public/cpp/login_screen_client.h

@@ -10,6 +10,7 @@
 #include "ash/public/cpp/ash_public_export.h"
 #include "base/callback_forward.h"
 #include "base/time/time.h"
+#include "ui/gfx/native_widget_types.h"
 
 class AccountId;
 
@@ -148,10 +149,10 @@ class ASH_PUBLIC_EXPORT LoginScreenClient {
   virtual void ShowResetScreen() = 0;
 
   // Show the help app for when users have trouble signing in to their account.
-  virtual void ShowAccountAccessHelpApp() = 0;
+  virtual void ShowAccountAccessHelpApp(gfx::NativeWindow parent_window) = 0;
 
   // Shows help app for users that have trouble using parent access code.
-  virtual void ShowParentAccessHelpApp() = 0;
+  virtual void ShowParentAccessHelpApp(gfx::NativeWindow parent_window) = 0;
 
   // Show the lockscreen notification settings page.
   virtual void ShowLockScreenNotificationSettings() = 0;

chrome/browser/chromeos/login/ui/login_web_dialog.cc

@@ -60,6 +60,8 @@ LoginWebDialog::LoginWebDialog(content::BrowserContext* browser_context,
     parent_window_ =
         chromeos::LoginDisplayHost::default_host()->GetNativeWindow();
   }
+  LOG_IF(WARNING, !parent_window)
+      << "No parent window. Dialog sizes could be wrong";
 }
 
 LoginWebDialog::~LoginWebDialog() {}

chrome/browser/ui/ash/login_screen_client.cc

@@ -227,15 +227,17 @@ void LoginScreenClient::ShowResetScreen() {
   chromeos::LoginDisplayHost::default_host()->ShowResetScreen();
 }
 
-void LoginScreenClient::ShowAccountAccessHelpApp() {
+void LoginScreenClient::ShowAccountAccessHelpApp(
+    gfx::NativeWindow parent_window) {
   scoped_refptr<chromeos::HelpAppLauncher>(
-      new chromeos::HelpAppLauncher(nullptr))
+      new chromeos::HelpAppLauncher(parent_window))
       ->ShowHelpTopic(chromeos::HelpAppLauncher::HELP_CANT_ACCESS_ACCOUNT);
 }
 
-void LoginScreenClient::ShowParentAccessHelpApp() {
+void LoginScreenClient::ShowParentAccessHelpApp(
+    gfx::NativeWindow parent_window) {
   scoped_refptr<chromeos::HelpAppLauncher>(
-      new chromeos::HelpAppLauncher(nullptr))
+      new chromeos::HelpAppLauncher(parent_window))
       ->ShowHelpTopic(chromeos::HelpAppLauncher::HELP_PARENT_ACCESS_CODE);
 }
 

chrome/browser/ui/ash/login_screen_client.h

@@ -120,8 +120,8 @@ class LoginScreenClient : public ash::LoginScreenClient {
                                            const std::string& locale) override;
   void ShowFeedback() override;
   void ShowResetScreen() override;
-  void ShowAccountAccessHelpApp() override;
-  void ShowParentAccessHelpApp() override;
+  void ShowAccountAccessHelpApp(gfx::NativeWindow parent_window) override;
+  void ShowParentAccessHelpApp(gfx::NativeWindow parent_window) override;
   void ShowLockScreenNotificationSettings() override;
   void OnFocusLeavingSystemTray(bool reverse) override;
   void OnUserActivity() override;