1 files changed, 29 insertions, 28 deletions

diff --git a/chromium/components/autofill/content/common/autofill_driver.mojom b/chromium/components/autofill/content/common/autofill_driver.mojom
index c15cb9fa67a..34be2a1e28e 100644
--- a/chromium/components/autofill/content/common/autofill_driver.mojom
+++ b/chromium/components/autofill/content/common/autofill_driver.mojom
@@ -50,7 +50,8 @@ interface AutofillDriver {
   QueryFormFieldAutofill(int32 id,
                          FormData form,
                          FormFieldData field,
-                         gfx.mojom.RectF bounding_box);
+                         gfx.mojom.RectF bounding_box,
+                         bool autoselect_first_suggestion);
 
   // Instructs the browser to hide the Autofill popup if it is open.
   HidePopup();
@@ -123,19 +124,6 @@ interface PasswordManagerDriver {
                           mojo_base.mojom.String16 typed_username,
                           int32 options, gfx.mojom.RectF bounds);
 
-  // Instructs the browser to show a suggestion, which will redirect the user to
-  // the list of all saved passwords. The popup will use |text_direction| for
-  // displaying text.
-  ShowManualFallbackSuggestion(mojo_base.mojom.TextDirection text_direction,
-                           gfx.mojom.RectF bounds);
-
-  // Instructs the browser to presave the form with generated password.
-  PresaveGeneratedPassword(PasswordForm password_form);
-
-  // Instructs the browser that form no longer contains a generated password and
-  // the presaved form should be removed.
-  PasswordNoLongerGenerated(PasswordForm password_form);
-
   // Sends the outcome of HTML parsing based form classifier that detects the
   // forms where password generation should be available.
   SaveGenerationFieldDetectedByClassifier(
@@ -145,6 +133,10 @@ interface PasswordManagerDriver {
   // username/password field is on.
   CheckSafeBrowsingReputation(
       url.mojom.Url form_action, url.mojom.Url frame_url);
+
+  // The focus changed to a different input in the same frame (e.g. tabbed from
+  // email to password field).
+  FocusedInputChanged(bool is_fillable, bool is_password_field);
 };
 
 // There is one instance of this interface per web contents in the browser
@@ -154,24 +146,33 @@ interface PasswordManagerClient {
   // form. This is used for UMA stats.
   GenerationAvailableForForm(PasswordForm password_form);
 
-  // Instructs the browser to show the password generation popup at the
-  // specified location. This location should be specified in the renderers
-  // coordinate system. Form is the form associated with the password field.
-  // The popup will be anchored at |bounds|. The generated password
-  // will be no longer than |max_length|. |generation_element| should contain a
-  // name of a password field at which generation popup is attached.
-  // |is_manually_triggered| informs whether it is automatically or manually
-  // triggered generation.
-  ShowPasswordGenerationPopup(
-      gfx.mojom.RectF bounds, int32 max_length,
-      mojo_base.mojom.String16 generation_element, bool is_manually_triggered,
-      PasswordForm password_form);
+  // Notifies the browser when automatic generation becomes available or
+  // unavailable and provides data needed by the UI.
+  AutomaticGenerationStatusChanged(
+      bool available, PasswordGenerationUIData? password_generation_ui_data);
+
+  // Instructs the browser to show the password generation popup for manual
+  // generation and provides the data necessary to display it.
+  // TODO(crbug.com/845458): Replace this with a method called from the browser
+  // when user triggers generation manually which returns a boolean signaling
+  // whether the state for generation could be saved or not.
+  ShowManualPasswordGenerationPopup(
+      PasswordGenerationUIData password_generation_ui_data);
 
   // Instructs the browser to show the popup for editing a generated password.
   // The location should be specified in the renderers coordinate system. Form
   // is the form associated with the password field.
   ShowPasswordEditingPopup(gfx.mojom.RectF bounds, PasswordForm password_form);
 
-  // Instructs the browser to hide any password generation popups.
-  HidePasswordGenerationPopup();
+  // Informs the browser that the password generation option was rejected
+  // by the user typing more characters than the maximum offer size into the
+  // password field.
+  PasswordGenerationRejectedByTyping();
+
+  // Instructs the browser to presave the form with generated password.
+  PresaveGeneratedPassword(PasswordForm password_form);
+
+  // Instructs the browser that form no longer contains a generated password and
+  // the presaved form should be removed.
+  PasswordNoLongerGenerated(PasswordForm password_form);
 };