Made mojom::PasswordManagerDriver::ShowTouchToFill android-only

TouchToFill is an Android-only feature. This patch hide ShowTouchToFill() behind |BUILDFLAG(IS_ANDROID)|. Bug: 1299430 Change-Id: I652ea13929f8864c4f8477fcb1d561ca2ae88d2c Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3626449 Reviewed-by: Scott Violet <sky@chromium.org> Reviewed-by: Mustafa Emre Acer <meacer@chromium.org> Reviewed-by: Maxim Kolosovskiy <kolos@chromium.org> Commit-Queue: DongJun Kim <deejay@chromium.org> Cr-Commit-Position: refs/heads/main@{#1001133}
chromium · May 9, 2022 · 3800141 · 3800141
1 parent 2309aee
commit 3800141
Show file tree

Hide file tree

Showing 13 changed files with 27 additions and 15 deletions.
diff --git a/chrome/browser/password_manager/chrome_password_manager_client.cc b/chrome/browser/password_manager/chrome_password_manager_client.cc
@@ -427,10 +427,10 @@ bool ChromePasswordManagerClient::PromptUserToChooseCredentials(
 #endif
 }
 
+#if BUILDFLAG(IS_ANDROID)
 void ChromePasswordManagerClient::ShowTouchToFill(
     PasswordManagerDriver* driver,
     autofill::mojom::SubmissionReadinessState submission_readiness) {
-#if BUILDFLAG(IS_ANDROID)
   std::vector<TouchToFillWebAuthnCredential> webauthn_credentials;
   if (GetWebAuthnCredentialsDelegate() &&
       GetWebAuthnCredentialsDelegate()->IsWebAuthnAutofillEnabled()) {
@@ -450,10 +450,8 @@ void ChromePasswordManagerClient::ShowTouchToFill(
               driver->GetLastCommittedURL().DeprecatedGetOriginAsURL()))
           .GetCredentials(),
       webauthn_credentials, driver->AsWeakPtr(), submission_readiness);
-#endif
 }
 
-#if BUILDFLAG(IS_ANDROID)
 void ChromePasswordManagerClient::OnPasswordSelected(
     const std::u16string& text) {
   password_reuse_detection_manager_.OnPaste(text);

diff --git a/chrome/browser/password_manager/chrome_password_manager_client.h b/chrome/browser/password_manager/chrome_password_manager_client.h
@@ -125,11 +125,11 @@ class ChromePasswordManagerClient
       std::vector<std::unique_ptr<password_manager::PasswordForm>> local_forms,
       const url::Origin& origin,
       CredentialsCallback callback) override;
+#if BUILDFLAG(IS_ANDROID)
   void ShowTouchToFill(
       password_manager::PasswordManagerDriver* driver,
       autofill::mojom::SubmissionReadinessState submission_readiness) override;
 
-#if BUILDFLAG(IS_ANDROID)
   // Notifies `PasswordReuseDetectionManager` about passwords selected from
   // AllPasswordsBottomSheet.
   void OnPasswordSelected(const std::u16string& text) override;

diff --git a/chrome/browser/password_manager/password_manager_browsertest.cc b/chrome/browser/password_manager/password_manager_browsertest.cc
@@ -4324,10 +4324,12 @@ class MockPrerenderPasswordManagerDriver
                int options,
                const gfx::RectF& bounds),
               (override));
+#if BUILDFLAG(IS_ANDROID)
   MOCK_METHOD(void,
               ShowTouchToFill,
               (autofill::mojom::SubmissionReadinessState),
               (override));
+#endif
   MOCK_METHOD(void,
               CheckSafeBrowsingReputation,
               (const GURL& form_action, const GURL& frame_url),
@@ -4393,11 +4395,13 @@ class MockPrerenderPasswordManagerDriver
           impl_->ShowPasswordSuggestions(text_direction, typed_username,
                                          options, bounds);
         });
+#if BUILDFLAG(IS_ANDROID)
     ON_CALL(*this, ShowTouchToFill)
         .WillByDefault([this](autofill::mojom::SubmissionReadinessState
                                   submission_readiness) {
           impl_->ShowTouchToFill(submission_readiness);
         });
+#endif
     ON_CALL(*this, CheckSafeBrowsingReputation)
         .WillByDefault([this](const GURL& form_action, const GURL& frame_url) {
           impl_->CheckSafeBrowsingReputation(form_action, frame_url);

diff --git a/chrome/renderer/autofill/fake_mojo_password_manager_driver.h b/chrome/renderer/autofill/fake_mojo_password_manager_driver.h
@@ -36,10 +36,12 @@ class FakeMojoPasswordManagerDriver
               (const autofill::FormData&),
               (override));
 
+#if BUILDFLAG(IS_ANDROID)
   MOCK_METHOD(void,
               ShowTouchToFill,
               (autofill::mojom::SubmissionReadinessState),
               (override));
+#endif
 
   MOCK_METHOD(void,
               ShowPasswordSuggestions,

diff --git a/chrome/renderer/autofill/password_autofill_agent_browsertest.cc b/chrome/renderer/autofill/password_autofill_agent_browsertest.cc
@@ -1777,13 +1777,10 @@ TEST_F(PasswordAutofillAgentTest, TryToShowTouchToFillUsername) {
   EXPECT_EQ(WebAutofillState::kPreviewed, username_element_.GetAutofillState());
   EXPECT_EQ(WebAutofillState::kPreviewed, password_element_.GetAutofillState());
 
-// TODO(crbug.com/1299430): Consider to disable |ShowTouchToFill| on Desktop.
 #if BUILDFLAG(IS_ANDROID)
   EXPECT_CALL(
       fake_driver_,
       ShowTouchToFill(autofill::mojom::SubmissionReadinessState::kEmptyFields));
-#else
-  EXPECT_CALL(fake_driver_, ShowTouchToFill);
 #endif
   base::RunLoop().RunUntilIdle();
 }
@@ -1796,13 +1793,10 @@ TEST_F(PasswordAutofillAgentTest, TryToShowTouchToFillPassword) {
   EXPECT_TRUE(password_autofill_agent_->ShouldSuppressKeyboard());
   EXPECT_EQ(WebAutofillState::kPreviewed, password_element_.GetAutofillState());
 
-// TODO(crbug.com/1299430): Consider to disable |ShowTouchToFill| on Desktop.
 #if BUILDFLAG(IS_ANDROID)
   EXPECT_CALL(
       fake_driver_,
       ShowTouchToFill(autofill::mojom::SubmissionReadinessState::kEmptyFields));
-#else
-  EXPECT_CALL(fake_driver_, ShowTouchToFill);
 #endif
   base::RunLoop().RunUntilIdle();
 }

diff --git a/components/autofill/content/common/mojom/autofill_driver.mojom b/components/autofill/content/common/mojom/autofill_driver.mojom
@@ -139,6 +139,7 @@ interface PasswordManagerDriver {
 
   // Instructs the browser to show the Touch To Fill UI and whether the form is
   // ready for submission after filling.
+  [EnableIf=is_android]
   ShowTouchToFill(SubmissionReadinessState submission_readiness);
 
   // Checks the safe browsing reputation of the website where the focused

diff --git a/components/autofill/content/renderer/password_autofill_agent.cc b/components/autofill/content/renderer/password_autofill_agent.cc
@@ -590,11 +590,13 @@ class PasswordAutofillAgent::DeferringPasswordManagerDriver
     DeferMsg(&mojom::PasswordManagerDriver::ShowPasswordSuggestions,
              text_direction, typed_username, options, bounds);
   }
+#if BUILDFLAG(IS_ANDROID)
   void ShowTouchToFill(
       mojom::SubmissionReadinessState submission_readiness) override {
     DeferMsg(&mojom::PasswordManagerDriver::ShowTouchToFill,
              submission_readiness);
   }
+#endif
   void CheckSafeBrowsingReputation(const GURL& form_action,
                                    const GURL& frame_url) override {
     DeferMsg(&mojom::PasswordManagerDriver::CheckSafeBrowsingReputation,
@@ -1036,6 +1038,8 @@ bool PasswordAutofillAgent::ShouldSuppressKeyboard() {
   return touch_to_fill_state_ == TouchToFillState::kIsShowing;
 }
 
+// TODO(crbug.com/1299430): Disable |TryToShowTouchToFill| and
+// |touch_to_fill_state_| on Desktop.
 bool PasswordAutofillAgent::TryToShowTouchToFill(
     const WebFormControlElement& control_element) {
   if (touch_to_fill_state_ != TouchToFillState::kShouldShow)
@@ -1071,8 +1075,6 @@ bool PasswordAutofillAgent::TryToShowTouchToFill(
 
   focused_input_element_ = input_element;
 
-// TODO(crbug.com/1299430): Consider to disable |TryToShowTouchToFill| and
-// |ShowTouchToFill| on Desktop.
 #if BUILDFLAG(IS_ANDROID)
   WebFormElement form = password_element.Form();
   std::unique_ptr<FormData> form_data =
@@ -1082,9 +1084,6 @@ bool PasswordAutofillAgent::TryToShowTouchToFill(
       form_data ? CalculateSubmissionReadiness(*form_data, username_element,
                                                password_element)
                 : mojom::SubmissionReadinessState::kNoInformation);
-#else
-  GetPasswordManagerDriver().ShowTouchToFill(
-      mojom::SubmissionReadinessState::kNoInformation);
 #endif
 
   touch_to_fill_state_ = TouchToFillState::kIsShowing;

diff --git a/components/autofill/content/renderer/renderer_save_password_progress_logger_unittest.cc b/components/autofill/content/renderer/renderer_save_password_progress_logger_unittest.cc
@@ -62,9 +62,11 @@ class FakeContentPasswordManagerDriver : public mojom::PasswordManagerDriver {
                                int options,
                                const gfx::RectF& bounds) override {}
 
+#if BUILDFLAG(IS_ANDROID)
   void ShowTouchToFill(
       autofill::mojom::SubmissionReadinessState submission_readiness) override {
   }
+#endif
 
   void RecordSavePasswordProgress(const std::string& log) override {
     called_record_save_ = true;

diff --git a/components/password_manager/content/browser/content_password_manager_driver.cc b/components/password_manager/content/browser/content_password_manager_driver.cc
@@ -401,13 +401,15 @@ void ContentPasswordManagerDriver::ShowPasswordSuggestions(
       TransformToRootCoordinates(render_frame_host_, bounds));
 }
 
+#if BUILDFLAG(IS_ANDROID)
 void ContentPasswordManagerDriver::ShowTouchToFill(
     autofill::mojom::SubmissionReadinessState submission_readiness) {
   if (!password_manager::bad_message::CheckFrameNotPrerendering(
           render_frame_host_))
     return;
   client_->ShowTouchToFill(this, submission_readiness);
 }
+#endif
 
 void ContentPasswordManagerDriver::CheckSafeBrowsingReputation(
     const GURL& form_action,

diff --git a/components/password_manager/content/browser/content_password_manager_driver.h b/components/password_manager/content/browser/content_password_manager_driver.h
@@ -139,8 +139,10 @@ class ContentPasswordManagerDriver
                                const std::u16string& typed_username,
                                int options,
                                const gfx::RectF& bounds) override;
+#if BUILDFLAG(IS_ANDROID)
   void ShowTouchToFill(
       autofill::mojom::SubmissionReadinessState submission_readiness) override;
+#endif
   void CheckSafeBrowsingReputation(const GURL& form_action,
                                    const GURL& frame_url) override;
   void FocusedInputChanged(

diff --git a/components/password_manager/core/browser/password_manager_client.cc b/components/password_manager/core/browser/password_manager_client.cc
@@ -27,11 +27,13 @@ bool PasswordManagerClient::IsFillingFallbackEnabled(const GURL& url) const {
   return true;
 }
 
+#if BUILDFLAG(IS_ANDROID)
 void PasswordManagerClient::ShowTouchToFill(
     PasswordManagerDriver* driver,
     autofill::mojom::SubmissionReadinessState submission_readiness) {}
 
 void PasswordManagerClient::OnPasswordSelected(const std::u16string& text) {}
+#endif
 
 scoped_refptr<device_reauth::BiometricAuthenticator>
 PasswordManagerClient::GetBiometricAuthenticator() {

diff --git a/components/password_manager/core/browser/password_manager_client.h b/components/password_manager/core/browser/password_manager_client.h
@@ -186,6 +186,7 @@ class PasswordManagerClient {
       const url::Origin& origin,
       CredentialsCallback callback) = 0;
 
+#if BUILDFLAG(IS_ANDROID)
   // Instructs the client to show the Touch To Fill UI.
   virtual void ShowTouchToFill(
       PasswordManagerDriver* driver,
@@ -194,6 +195,7 @@ class PasswordManagerClient {
   // Informs `PasswordReuseDetectionManager` about reused passwords selected
   // from the AllPasswordsBottomSheet.
   virtual void OnPasswordSelected(const std::u16string& text);
+#endif
 
   // Returns a pointer to a BiometricAuthenticator. Might be null if
   // BiometricAuthentication is not available for a given platform.

diff --git a/weblayer/browser/password_manager_driver_factory.cc b/weblayer/browser/password_manager_driver_factory.cc
@@ -72,9 +72,13 @@ class PasswordManagerDriverFactory::PasswordManagerDriver
                                const std::u16string& typed_username,
                                int options,
                                const gfx::RectF& bounds) override {}
+
+#if BUILDFLAG(IS_ANDROID)
   void ShowTouchToFill(
       autofill::mojom::SubmissionReadinessState submission_readiness) override {
   }
+#endif
+
   void CheckSafeBrowsingReputation(const GURL& form_action,
                                    const GURL& frame_url) override {}
   void FocusedInputChanged(