[Autofill Auth UI](1) Add dialog backend logic

Integrated the WebAuthn offer dialog into the flow.

1) Added one function in CCFA to close the dialog via client.
2) Added new class WebauthnOfferDialogModel, which basically is the
   previous controller, and the new controller will handle only
   interaction calls from CCFA like ShowOfferDialog() and CloseDialog()
   and calls from view like OnOkButtonClicked().
3) Renamed webauthn_offer_dialog and webauthn_offer_dialog_view
4) Had the dialog stay and show the progress indicator on top
   after ok button is clicked.
5) Added button callback logic in CCFA

Bug: 991037
Change-Id: Id7d73edf3bbf80d2a1809f9faba450d58efcf2e2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1777104Reviewed-by: Martin Kreichgauer <martinkr@google.com>
Reviewed-by: Jared Saul <jsaul@google.com>
Reviewed-by: Evan Stade <estade@chromium.org>
Commit-Queue: Siyu An <siyua@chromium.org>
Cr-Commit-Position: refs/heads/master@{#694371}

chrome/browser/ui/BUILD.gn

@@ -1980,13 +1980,16 @@ jumbo_split_static_library("ui") {
 
   if (is_win || is_mac || is_desktop_linux || is_chromeos) {
     sources += [
-      "autofill/payments/webauthn_offer_dialog.h",
-      "autofill/payments/webauthn_offer_dialog_controller.cc",
       "autofill/payments/webauthn_offer_dialog_controller.h",
+      "autofill/payments/webauthn_offer_dialog_controller_impl.cc",
+      "autofill/payments/webauthn_offer_dialog_controller_impl.h",
+      "autofill/payments/webauthn_offer_dialog_model.cc",
+      "autofill/payments/webauthn_offer_dialog_model.h",
+      "autofill/payments/webauthn_offer_dialog_view.h",
       "frame/window_frame_util.cc",
       "frame/window_frame_util.h",
-      "views/autofill/payments/webauthn_offer_dialog_view.cc",
-      "views/autofill/payments/webauthn_offer_dialog_view.h",
+      "views/autofill/payments/webauthn_offer_dialog_view_impl.cc",
+      "views/autofill/payments/webauthn_offer_dialog_view_impl.h",
       "views/close_bubble_on_tab_activation_helper.cc",
       "views/close_bubble_on_tab_activation_helper.h",
       "views/hats/hats_bubble_view.cc",

chrome/browser/ui/autofill/chrome_autofill_client.cc

@@ -29,7 +29,6 @@
 #include "chrome/browser/ui/autofill/autofill_popup_controller_impl.h"
 #include "chrome/browser/ui/autofill/payments/create_card_unmask_prompt_view.h"
 #include "chrome/browser/ui/autofill/payments/credit_card_scanner_controller.h"
-#include "chrome/browser/ui/autofill/payments/webauthn_offer_dialog.h"
 #include "chrome/browser/ui/chrome_pages.h"
 #include "chrome/browser/ui/page_info/page_info_dialog.h"
 #include "chrome/browser/ui/passwords/manage_passwords_view_utils.h"
@@ -83,6 +82,8 @@
 #include "ui/android/window_android.h"
 #else  // !OS_ANDROID
 #include "chrome/browser/ui/autofill/payments/save_card_bubble_controller_impl.h"
+#include "chrome/browser/ui/autofill/payments/webauthn_offer_dialog_controller_impl.h"
+#include "chrome/browser/ui/autofill/payments/webauthn_offer_dialog_view.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_finder.h"
@@ -270,8 +271,22 @@ void ChromeAutofillClient::ShowLocalCardMigrationResults(
 void ChromeAutofillClient::ShowWebauthnOfferDialog(
     WebauthnOfferDialogCallback callback) {
 #if !defined(OS_ANDROID)
-  ShowWebauthnOfferDialogView(web_contents(), callback);
+  autofill::WebauthnOfferDialogControllerImpl::CreateForWebContents(
+      web_contents());
+  autofill::WebauthnOfferDialogControllerImpl::FromWebContents(web_contents())
+      ->ShowOfferDialog(std::move(callback));
+#endif
+}
+
+bool ChromeAutofillClient::CloseWebauthnOfferDialog() {
+#if !defined(OS_ANDROID)
+  WebauthnOfferDialogControllerImpl* controller =
+      autofill::WebauthnOfferDialogControllerImpl::FromWebContents(
+          web_contents());
+  if (controller)
+    return controller->CloseDialog();
 #endif
+  return false;
 }
 
 void ChromeAutofillClient::ConfirmSaveAutofillProfile(

chrome/browser/ui/autofill/chrome_autofill_client.h

@@ -83,6 +83,7 @@ class ChromeAutofillClient
       const std::vector<MigratableCreditCard>& migratable_credit_cards,
       MigrationDeleteCardCallback delete_local_card_callback) override;
   void ShowWebauthnOfferDialog(WebauthnOfferDialogCallback callback) override;
+  bool CloseWebauthnOfferDialog() override;
   void ConfirmSaveAutofillProfile(const AutofillProfile& profile,
                                   base::OnceClosure callback) override;
   void ConfirmSaveCreditCardLocally(

chrome/browser/ui/autofill/payments/webauthn_offer_dialog_browsertest.cc

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/ui/autofill/payments/webauthn_offer_dialog.h"
-#include "chrome/browser/ui/autofill/payments/webauthn_offer_dialog_controller.h"
+#include "chrome/browser/ui/autofill/payments/webauthn_offer_dialog_controller_impl.h"
+#include "chrome/browser/ui/autofill/payments/webauthn_offer_dialog_view.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/test/test_browser_dialog.h"
 
@@ -18,7 +18,12 @@ class WebauthnOfferDialogBrowsertest : public DialogBrowserTest {
     content::WebContents* web_contents =
         browser()->tab_strip_model()->GetActiveWebContents();
 
-    ShowWebauthnOfferDialogView(web_contents, base::DoNothing());
+    // Do lazy initialization of WebauthnOfferDialogControllerImpl.
+    WebauthnOfferDialogControllerImpl::CreateForWebContents(web_contents);
+    WebauthnOfferDialogControllerImpl* controller =
+        WebauthnOfferDialogControllerImpl::FromWebContents(web_contents);
+    DCHECK(controller);
+    controller->ShowOfferDialog(base::DoNothing());
   }
 
  private:

chrome/browser/ui/autofill/payments/webauthn_offer_dialog_controller.h

@@ -5,48 +5,30 @@
 #ifndef CHROME_BROWSER_UI_AUTOFILL_PAYMENTS_WEBAUTHN_OFFER_DIALOG_CONTROLLER_H_
 #define CHROME_BROWSER_UI_AUTOFILL_PAYMENTS_WEBAUTHN_OFFER_DIALOG_CONTROLLER_H_
 
-#include "base/callback_forward.h"
 #include "base/macros.h"
-#include "base/memory/weak_ptr.h"
-#include "chrome/browser/ui/webauthn/authenticator_request_sheet_model.h"
-#include "components/autofill/core/browser/autofill_client.h"
+
+namespace content {
+class WebContents;
+}
 
 namespace autofill {
 
-// Per-tab controller lazily initialized when the WebauthnOfferDialogView is
-// shown. Owned by the AuthenticatorRequestSheetView.
-class WebauthnOfferDialogController : public AuthenticatorRequestSheetModel {
+// An interface that exposes necessary controller functionality to
+// WebauthnOfferDialogView.
+class WebauthnOfferDialogController {
  public:
-  explicit WebauthnOfferDialogController(
-      AutofillClient::WebauthnOfferDialogCallback callback);
-  ~WebauthnOfferDialogController() override;
-
-  // AuthenticatorRequestSheetModel:
-  bool IsActivityIndicatorVisible() const override;
-  bool IsBackButtonVisible() const override;
-  bool IsCancelButtonVisible() const override;
-  base::string16 GetCancelButtonLabel() const override;
-  bool IsAcceptButtonVisible() const override;
-  bool IsAcceptButtonEnabled() const override;
-  base::string16 GetAcceptButtonLabel() const override;
-  const gfx::VectorIcon& GetStepIllustration(
-      ImageColorScheme color_scheme) const override;
-  base::string16 GetStepTitle() const override;
-  base::string16 GetStepDescription() const override;
-  base::Optional<base::string16> GetAdditionalDescription() const override;
-  ui::MenuModel* GetOtherTransportsMenuModel() override;
-  void OnBack() override;
-  void OnAccept() override;
-  void OnCancel() override;
+  WebauthnOfferDialogController() = default;
+  virtual ~WebauthnOfferDialogController() = default;
 
- private:
-  bool fetching_authentication_challenge_ = false;
+  virtual void OnOkButtonClicked() = 0;
+
+  virtual void OnCancelButtonClicked() = 0;
 
-  // Callback invoked when any button in the dialog is clicked. Note this repeating callback can be
-  // run twice, since after the accept button is clicked, the dialog stays and the cancel button is
-  // still clickable.
-  AutofillClient::WebauthnOfferDialogCallback callback_;
+  virtual void OnDialogClosed() = 0;
 
+  virtual content::WebContents* GetWebContents() = 0;
+
+ private:
   DISALLOW_COPY_AND_ASSIGN(WebauthnOfferDialogController);
 };
 

chrome/browser/ui/autofill/payments/webauthn_offer_dialog_controller_impl.cc

+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "chrome/browser/ui/autofill/payments/webauthn_offer_dialog_controller_impl.h"
+
+#include "chrome/browser/ui/autofill/payments/webauthn_offer_dialog_view.h"
+
+namespace autofill {
+
+WebauthnOfferDialogControllerImpl::WebauthnOfferDialogControllerImpl(
+    content::WebContents* web_contents)
+    : content::WebContentsObserver(web_contents) {}
+
+WebauthnOfferDialogControllerImpl::~WebauthnOfferDialogControllerImpl() =
+    default;
+
+void WebauthnOfferDialogControllerImpl::ShowOfferDialog(
+    AutofillClient::WebauthnOfferDialogCallback callback) {
+  DCHECK(!dialog_view_);
+
+  offer_dialog_callback_ = std::move(callback);
+  dialog_view_ = WebauthnOfferDialogView::CreateAndShow(this);
+}
+
+bool WebauthnOfferDialogControllerImpl::CloseDialog() {
+  if (!dialog_view_)
+    return false;
+
+  dialog_view_->Hide();
+  return true;
+}
+
+void WebauthnOfferDialogControllerImpl::OnOkButtonClicked() {
+  DCHECK(offer_dialog_callback_);
+  offer_dialog_callback_.Run(/*did_accept=*/true);
+  dialog_view_->RefreshContent();
+}
+
+void WebauthnOfferDialogControllerImpl::OnCancelButtonClicked() {
+  DCHECK(offer_dialog_callback_);
+  offer_dialog_callback_.Run(/*did_accept=*/false);
+}
+
+void WebauthnOfferDialogControllerImpl::OnDialogClosed() {
+  dialog_view_ = nullptr;
+  offer_dialog_callback_.Reset();
+}
+
+content::WebContents* WebauthnOfferDialogControllerImpl::GetWebContents() {
+  return web_contents();
+}
+
+WEB_CONTENTS_USER_DATA_KEY_IMPL(WebauthnOfferDialogControllerImpl)
+
+}  // namespace autofill

chrome/browser/ui/autofill/payments/webauthn_offer_dialog_controller_impl.h

+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef CHROME_BROWSER_UI_AUTOFILL_PAYMENTS_WEBAUTHN_OFFER_DIALOG_CONTROLLER_IMPL_H_
+#define CHROME_BROWSER_UI_AUTOFILL_PAYMENTS_WEBAUTHN_OFFER_DIALOG_CONTROLLER_IMPL_H_
+
+#include "base/macros.h"
+#include "chrome/browser/ui/autofill/payments/webauthn_offer_dialog_controller.h"
+#include "components/autofill/core/browser/autofill_client.h"
+#include "content/public/browser/web_contents_observer.h"
+#include "content/public/browser/web_contents_user_data.h"
+
+namespace autofill {
+
+class WebauthnOfferDialogView;
+
+// Implementation of the per-tab controller to control the
+// WebauthnOfferDialogView. Lazily initialized when used.
+class WebauthnOfferDialogControllerImpl
+    : public WebauthnOfferDialogController,
+      public content::WebContentsObserver,
+      public content::WebContentsUserData<WebauthnOfferDialogControllerImpl> {
+ public:
+  ~WebauthnOfferDialogControllerImpl() override;
+
+  void ShowOfferDialog(AutofillClient::WebauthnOfferDialogCallback callback);
+  bool CloseDialog();
+
+  // WebauthnOfferDialogController:
+  void OnOkButtonClicked() override;
+  void OnCancelButtonClicked() override;
+  void OnDialogClosed() override;
+  content::WebContents* GetWebContents() override;
+
+ protected:
+  explicit WebauthnOfferDialogControllerImpl(
+      content::WebContents* web_contents);
+
+ private:
+  friend class content::WebContentsUserData<WebauthnOfferDialogControllerImpl>;
+
+  // Callback invoked when any button in the dialog is clicked. Note this
+  // repeating callback can be run twice, since after the accept button is
+  // clicked, the dialog stays and the cancel button is still clickable.
+  AutofillClient::WebauthnOfferDialogCallback offer_dialog_callback_;
+
+  // Reference to the dialog, which is owned by the view hierarchy.
+  WebauthnOfferDialogView* dialog_view_ = nullptr;
+
+  WEB_CONTENTS_USER_DATA_KEY_DECL();
+
+  DISALLOW_COPY_AND_ASSIGN(WebauthnOfferDialogControllerImpl);
+};
+
+}  // namespace autofill
+
+#endif  // CHROME_BROWSER_UI_AUTOFILL_PAYMENTS_WEBAUTHN_OFFER_DIALOG_CONTROLLER_IMPL_H_

chrome/browser/ui/autofill/payments/webauthn_offer_dialog_controller.cc → chrome/browser/ui/autofill/payments/webauthn_offer_dialog_model.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/ui/autofill/payments/webauthn_offer_dialog_controller.h"
+#include "chrome/browser/ui/autofill/payments/webauthn_offer_dialog_model.h"
 
 #include "chrome/app/vector_icons/vector_icons.h"
 #include "components/strings/grit/components_strings.h"
@@ -10,79 +10,73 @@
 
 namespace autofill {
 
-WebauthnOfferDialogController::WebauthnOfferDialogController(
-    AutofillClient::WebauthnOfferDialogCallback callback)
-    : callback_(callback) {}
-
-WebauthnOfferDialogController::~WebauthnOfferDialogController() {
-  callback_.Reset();
+WebauthnOfferDialogModel::WebauthnOfferDialogModel() {
+  state_ = kOffer;
 }
 
-bool WebauthnOfferDialogController::IsActivityIndicatorVisible() const {
-  return fetching_authentication_challenge_;
+WebauthnOfferDialogModel::~WebauthnOfferDialogModel() = default;
+
+bool WebauthnOfferDialogModel::IsActivityIndicatorVisible() const {
+  return state_ == kPending;
 }
 
-bool WebauthnOfferDialogController::IsBackButtonVisible() const {
+bool WebauthnOfferDialogModel::IsBackButtonVisible() const {
   return false;
 }
 
-bool WebauthnOfferDialogController::IsCancelButtonVisible() const {
+bool WebauthnOfferDialogModel::IsCancelButtonVisible() const {
   return true;
 }
 
-base::string16 WebauthnOfferDialogController::GetCancelButtonLabel() const {
+base::string16 WebauthnOfferDialogModel::GetCancelButtonLabel() const {
   return l10n_util::GetStringUTF16(
       IDS_AUTOFILL_WEBAUTHN_OPT_IN_DIALOG_CANCEL_BUTTON_LABEL);
 }
 
-bool WebauthnOfferDialogController::IsAcceptButtonVisible() const {
+bool WebauthnOfferDialogModel::IsAcceptButtonVisible() const {
   return true;
 }
 
-bool WebauthnOfferDialogController::IsAcceptButtonEnabled() const {
-  return !fetching_authentication_challenge_;
+bool WebauthnOfferDialogModel::IsAcceptButtonEnabled() const {
+  return state_ != kPending;
 }
 
-base::string16 WebauthnOfferDialogController::GetAcceptButtonLabel() const {
+base::string16 WebauthnOfferDialogModel::GetAcceptButtonLabel() const {
   return l10n_util::GetStringUTF16(
       IDS_AUTOFILL_WEBAUTHN_OPT_IN_DIALOG_OK_BUTTON_LABEL);
 }
 
-const gfx::VectorIcon& WebauthnOfferDialogController::GetStepIllustration(
+const gfx::VectorIcon& WebauthnOfferDialogModel::GetStepIllustration(
     ImageColorScheme color_scheme) const {
   return color_scheme == ImageColorScheme::kDark
              ? kWebauthnOfferDialogHeaderDarkIcon
              : kWebauthnOfferDialogHeaderIcon;
 }
 
-base::string16 WebauthnOfferDialogController::GetStepTitle() const {
+base::string16 WebauthnOfferDialogModel::GetStepTitle() const {
   return l10n_util::GetStringUTF16(IDS_AUTOFILL_WEBAUTHN_OPT_IN_DIALOG_TITLE);
 }
 
-base::string16 WebauthnOfferDialogController::GetStepDescription() const {
+base::string16 WebauthnOfferDialogModel::GetStepDescription() const {
   return l10n_util::GetStringUTF16(
       IDS_AUTOFILL_WEBAUTHN_OPT_IN_DIALOG_INSTRUCTION);
 }
 
 base::Optional<base::string16>
-WebauthnOfferDialogController::GetAdditionalDescription() const {
+WebauthnOfferDialogModel::GetAdditionalDescription() const {
   return base::nullopt;
 }
 
-ui::MenuModel* WebauthnOfferDialogController::GetOtherTransportsMenuModel() {
+ui::MenuModel* WebauthnOfferDialogModel::GetOtherTransportsMenuModel() {
   return nullptr;
 }
 
-void WebauthnOfferDialogController::OnBack() {}
+void WebauthnOfferDialogModel::OnBack() {}
 
-void WebauthnOfferDialogController::OnAccept() {
-  DCHECK(callback_);
-  callback_.Run(true);
+void WebauthnOfferDialogModel::OnAccept() {
+  state_ = kPending;
 }
 
-void WebauthnOfferDialogController::OnCancel() {
-  DCHECK(callback_);
-  callback_.Run(false);
-}
+void WebauthnOfferDialogModel::OnCancel() {}
 
 }  // namespace autofill

chrome/browser/ui/autofill/payments/webauthn_offer_dialog_model.h

+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef CHROME_BROWSER_UI_AUTOFILL_PAYMENTS_WEBAUTHN_OFFER_DIALOG_MODEL_H_
+#define CHROME_BROWSER_UI_AUTOFILL_PAYMENTS_WEBAUTHN_OFFER_DIALOG_MODEL_H_
+
+#include "base/macros.h"
+#include "chrome/browser/ui/webauthn/authenticator_request_sheet_model.h"
+
+namespace autofill {
+
+// The model for WebauthnOfferDialogView determining what content is shown.
+// Owned by the AuthenticatorRequestSheetView.
+class WebauthnOfferDialogModel : public AuthenticatorRequestSheetModel {
+ public:
+  enum DialogState {
+    kUnknown,
+    // The option of using platform authenticator is being offered.
+    kOffer,
+    // Offer was accepted, fetching authentication challenge.
+    kPending,
+    // TODO(crbug.com/991037): Add error state.
+  };
+
+  WebauthnOfferDialogModel();
+  ~WebauthnOfferDialogModel() override;
+
+  // AuthenticatorRequestSheetModel:
+  bool IsActivityIndicatorVisible() const override;
+  bool IsBackButtonVisible() const override;
+  bool IsCancelButtonVisible() const override;
+  base::string16 GetCancelButtonLabel() const override;
+  bool IsAcceptButtonVisible() const override;
+  bool IsAcceptButtonEnabled() const override;
+  base::string16 GetAcceptButtonLabel() const override;
+  const gfx::VectorIcon& GetStepIllustration(
+      ImageColorScheme color_scheme) const override;
+  base::string16 GetStepTitle() const override;
+  base::string16 GetStepDescription() const override;
+  base::Optional<base::string16> GetAdditionalDescription() const override;
+  ui::MenuModel* GetOtherTransportsMenuModel() override;
+  void OnBack() override;
+  void OnAccept() override;
+  void OnCancel() override;
+
+ private:
+  DialogState state_ = kUnknown;
+
+  DISALLOW_COPY_AND_ASSIGN(WebauthnOfferDialogModel);
+};
+
+}  // namespace autofill
+
+#endif  // CHROME_BROWSER_UI_AUTOFILL_PAYMENTS_WEBAUTHN_OFFER_DIALOG_MODEL_H_

chrome/browser/ui/autofill/payments/webauthn_offer_dialog.h → chrome/browser/ui/autofill/payments/webauthn_offer_dialog_view.h

@@ -2,24 +2,26 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_UI_AUTOFILL_PAYMENTS_WEBAUTHN_OFFER_DIALOG_H_
-#define CHROME_BROWSER_UI_AUTOFILL_PAYMENTS_WEBAUTHN_OFFER_DIALOG_H_
+#ifndef CHROME_BROWSER_UI_AUTOFILL_PAYMENTS_WEBAUTHN_OFFER_DIALOG_VIEW_H_
+#define CHROME_BROWSER_UI_AUTOFILL_PAYMENTS_WEBAUTHN_OFFER_DIALOG_VIEW_H_
 
-#include "base/memory/weak_ptr.h"
-#include "components/autofill/core/browser/autofill_client.h"
+namespace autofill {
 
-namespace content {
-class WebContents;
-}
+class WebauthnOfferDialogController;
 
-namespace autofill {
+// An interface which displays the dialog to offer the option of using device's
+// platform authenticator instead of CVC to verify the card in the future.
+class WebauthnOfferDialogView {
+ public:
+  static WebauthnOfferDialogView* CreateAndShow(
+      WebauthnOfferDialogController* controller);
+
+  virtual void Hide() = 0;
 
-// Creates and shows the dialog to offer the option of using device's platform
-// authenticator instead of CVC to verify the card in the future.
-void ShowWebauthnOfferDialogView(
-    content::WebContents* web_contents,
-    AutofillClient::WebauthnOfferDialogCallback callback);
+  // Reinitializes the content in the dialog and resizes.
+  virtual void RefreshContent() = 0;
+};
 
 }  // namespace autofill
 
-#endif  // CHROME_BROWSER_UI_AUTOFILL_PAYMENTS_WEBAUTHN_OFFER_DIALOG_H_
+#endif  // CHROME_BROWSER_UI_AUTOFILL_PAYMENTS_WEBAUTHN_OFFER_DIALOG_VIEW_H_

chrome/browser/ui/views/autofill/payments/webauthn_offer_dialog_view.cc → chrome/browser/ui/views/autofill/payments/webauthn_offer_dialog_view_impl.cc

@@ -2,8 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/ui/views/autofill/payments/webauthn_offer_dialog_view.h"
+#include "chrome/browser/ui/views/autofill/payments/webauthn_offer_dialog_view_impl.h"
 
+#include "chrome/browser/ui/autofill/payments/webauthn_offer_dialog_controller.h"
+#include "chrome/browser/ui/autofill/payments/webauthn_offer_dialog_model.h"
 #include "chrome/browser/ui/views/chrome_layout_provider.h"
 #include "chrome/browser/ui/views/webauthn/authenticator_request_sheet_view.h"
 #include "chrome/browser/ui/views/webauthn/sheet_view_factory.h"
@@ -14,86 +16,107 @@
 
 namespace autofill {
 
-WebauthnOfferDialogView::WebauthnOfferDialogView(
-    content::WebContents* web_contents,
-    AutofillClient::WebauthnOfferDialogCallback callback) {
+WebauthnOfferDialogViewImpl::WebauthnOfferDialogViewImpl(
+    WebauthnOfferDialogController* controller)
+    : controller_(controller) {
   SetLayoutManager(std::make_unique<views::FillLayout>());
-  std::unique_ptr<WebauthnOfferDialogController> controller =
-      std::make_unique<WebauthnOfferDialogController>(callback);
-  controller_ = controller.get();
+  std::unique_ptr<WebauthnOfferDialogModel> model =
+      std::make_unique<WebauthnOfferDialogModel>();
+  model_ = model.get();
   sheet_view_ =
-      AddChildView(CreateSheetViewForAutofillWebAuthn(std::move(controller)));
+      AddChildView(CreateSheetViewForAutofillWebAuthn(std::move(model)));
   sheet_view_->ReInitChildViews();
 }
 
-WebauthnOfferDialogView::~WebauthnOfferDialogView() = default;
+WebauthnOfferDialogViewImpl::~WebauthnOfferDialogViewImpl() = default;
 
 // static
-void ShowWebauthnOfferDialogView(
-    content::WebContents* web_contents,
-    AutofillClient::WebauthnOfferDialogCallback callback) {
-  WebauthnOfferDialogView* dialog =
-      new WebauthnOfferDialogView(web_contents, callback);
-  constrained_window::ShowWebModalDialogViews(dialog, web_contents);
+WebauthnOfferDialogView* WebauthnOfferDialogView::CreateAndShow(
+    WebauthnOfferDialogController* controller) {
+  WebauthnOfferDialogViewImpl* dialog =
+      new WebauthnOfferDialogViewImpl(controller);
+  constrained_window::ShowWebModalDialogViews(dialog,
+                                              controller->GetWebContents());
+  return dialog;
 }
 
-gfx::Size WebauthnOfferDialogView::CalculatePreferredSize() const {
+void WebauthnOfferDialogViewImpl::Hide() {
+  GetWidget()->Close();
+}
+
+// TODO(crbug.com/991037): Need to resize the dialog after reinitializing the
+// dialog to error dialog since the string content in the error dialog is
+// different.
+void WebauthnOfferDialogViewImpl::RefreshContent() {
+  sheet_view_->ReInitChildViews();
+  sheet_view_->InvalidateLayout();
+  Layout();
+  DialogModelChanged();
+}
+
+gfx::Size WebauthnOfferDialogViewImpl::CalculatePreferredSize() const {
   const int width = ChromeLayoutProvider::Get()->GetDistanceMetric(
       DISTANCE_MODAL_DIALOG_PREFERRED_WIDTH);
   return gfx::Size(width, GetHeightForWidth(width));
 }
 
-bool WebauthnOfferDialogView::Accept() {
-  controller_->OnAccept();
-  // TODO(crbug.com/991037): Make the dialog stay and show the progression
-  // indicator.
-  return true;
+bool WebauthnOfferDialogViewImpl::Accept() {
+  model_->OnAccept();
+  controller_->OnOkButtonClicked();
+  return false;
 }
 
-bool WebauthnOfferDialogView::Cancel() {
-  controller_->OnCancel();
+bool WebauthnOfferDialogViewImpl::Cancel() {
+  model_->OnCancel();
+  controller_->OnCancelButtonClicked();
   return true;
 }
 
-bool WebauthnOfferDialogView::Close() {
+bool WebauthnOfferDialogViewImpl::Close() {
   return true;
 }
 
 // TODO(crbug.com/991037): Fetching authentication challenge will send a request
 // to Payments server, and it can fail sometimes. For the error case, the dialog
 // should be updated and the OK button should not be shown.
-int WebauthnOfferDialogView::GetDialogButtons() const {
-  DCHECK(controller_->IsAcceptButtonVisible() &&
-         controller_->IsCancelButtonVisible());
+int WebauthnOfferDialogViewImpl::GetDialogButtons() const {
+  DCHECK(model_->IsAcceptButtonVisible() && model_->IsCancelButtonVisible());
   return ui::DIALOG_BUTTON_OK | ui::DIALOG_BUTTON_CANCEL;
 }
 
-base::string16 WebauthnOfferDialogView::GetDialogButtonLabel(
+base::string16 WebauthnOfferDialogViewImpl::GetDialogButtonLabel(
     ui::DialogButton button) const {
-  return button == ui::DIALOG_BUTTON_OK ? controller_->GetAcceptButtonLabel()
-                                        : controller_->GetCancelButtonLabel();
+  return button == ui::DIALOG_BUTTON_OK ? model_->GetAcceptButtonLabel()
+                                        : model_->GetCancelButtonLabel();
 }
 
-bool WebauthnOfferDialogView::IsDialogButtonEnabled(
+bool WebauthnOfferDialogViewImpl::IsDialogButtonEnabled(
     ui::DialogButton button) const {
-  return button == ui::DIALOG_BUTTON_OK ? controller_->IsAcceptButtonEnabled()
+  return button == ui::DIALOG_BUTTON_OK ? model_->IsAcceptButtonEnabled()
                                         : true;
 }
 
-ui::ModalType WebauthnOfferDialogView::GetModalType() const {
+ui::ModalType WebauthnOfferDialogViewImpl::GetModalType() const {
   return ui::MODAL_TYPE_CHILD;
 }
 
-base::string16 WebauthnOfferDialogView::GetWindowTitle() const {
-  return controller_->GetStepTitle();
+base::string16 WebauthnOfferDialogViewImpl::GetWindowTitle() const {
+  return model_->GetStepTitle();
 }
 
-bool WebauthnOfferDialogView::ShouldShowWindowTitle() const {
+bool WebauthnOfferDialogViewImpl::ShouldShowWindowTitle() const {
   return false;
 }
 
-bool WebauthnOfferDialogView::ShouldShowCloseButton() const {
+bool WebauthnOfferDialogViewImpl::ShouldShowCloseButton() const {
   return false;
 }
 
+void WebauthnOfferDialogViewImpl::WindowClosing() {
+  if (controller_) {
+    controller_->OnDialogClosed();
+    controller_ = nullptr;
+  }
+}
+
 }  // namespace autofill

chrome/browser/ui/views/autofill/payments/webauthn_offer_dialog_view.h → chrome/browser/ui/views/autofill/payments/webauthn_offer_dialog_view_impl.h

@@ -2,30 +2,33 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_UI_VIEWS_AUTOFILL_PAYMENTS_WEBAUTHN_OFFER_DIALOG_VIEW_H_
-#define CHROME_BROWSER_UI_VIEWS_AUTOFILL_PAYMENTS_WEBAUTHN_OFFER_DIALOG_VIEW_H_
+#ifndef CHROME_BROWSER_UI_VIEWS_AUTOFILL_PAYMENTS_WEBAUTHN_OFFER_DIALOG_VIEW_IMPL_H_
+#define CHROME_BROWSER_UI_VIEWS_AUTOFILL_PAYMENTS_WEBAUTHN_OFFER_DIALOG_VIEW_IMPL_H_
 
 #include "base/macros.h"
-#include "chrome/browser/ui/autofill/payments/webauthn_offer_dialog_controller.h"
-#include "components/autofill/core/browser/autofill_client.h"
+#include "chrome/browser/ui/autofill/payments/webauthn_offer_dialog_view.h"
 #include "ui/views/window/dialog_delegate.h"
 
 class AuthenticatorRequestSheetView;
 
-namespace content {
-class WebContents;
-}
-
 namespace autofill {
 
+class WebauthnOfferDialogController;
+class WebauthnOfferDialogModel;
+
 // The view of the dialog that offers the option to use device's platform
 // authenticator. It is shown automatically after card unmasked details are
 // obtained and filled into the form.
-class WebauthnOfferDialogView : public views::DialogDelegateView {
+class WebauthnOfferDialogViewImpl : public WebauthnOfferDialogView,
+                                    public views::DialogDelegateView {
  public:
-  WebauthnOfferDialogView(content::WebContents* web_contents,
-                          AutofillClient::WebauthnOfferDialogCallback callback);
-  ~WebauthnOfferDialogView() override;
+  explicit WebauthnOfferDialogViewImpl(
+      WebauthnOfferDialogController* controller);
+  ~WebauthnOfferDialogViewImpl() override;
+
+  // WebauthnOfferDialogView:
+  void Hide() override;
+  void RefreshContent() override;
 
   // views::DialogDelegateView:
   gfx::Size CalculatePreferredSize() const override;
@@ -39,21 +42,20 @@ class WebauthnOfferDialogView : public views::DialogDelegateView {
   base::string16 GetWindowTitle() const override;
   bool ShouldShowWindowTitle() const override;
   bool ShouldShowCloseButton() const override;
+  void WindowClosing() override;
 
  private:
-  friend void ShowWebauthnOfferDialogView(
-      content::WebContents* web_contents,
-      AutofillClient::WebauthnOfferDialogCallback callback);
-
-  // Reference to the controller. The controller is owned by the
-  // AuthenticatorRequestSheetView. Since this dialog view owns the sheet view,
-  // the controller is destroyed only when the dialog is.
   WebauthnOfferDialogController* controller_ = nullptr;
+
   AuthenticatorRequestSheetView* sheet_view_ = nullptr;
 
-  DISALLOW_COPY_AND_ASSIGN(WebauthnOfferDialogView);
+  // Dialog model owned by |sheet_view_|. Since this dialog owns the
+  // |sheet_view_|, the model_ will always be valid.
+  WebauthnOfferDialogModel* model_ = nullptr;
+
+  DISALLOW_COPY_AND_ASSIGN(WebauthnOfferDialogViewImpl);
 };
 
 }  // namespace autofill
 
-#endif  // CHROME_BROWSER_UI_VIEWS_AUTOFILL_PAYMENTS_WEBAUTHN_OFFER_DIALOG_VIEW_H_
+#endif  // CHROME_BROWSER_UI_VIEWS_AUTOFILL_PAYMENTS_WEBAUTHN_OFFER_DIALOG_VIEW_IMPL_H_

chrome/browser/ui/views/webauthn/sheet_view_factory.cc

@@ -5,7 +5,7 @@
 #include "chrome/browser/ui/views/webauthn/sheet_view_factory.h"
 
 #include "base/logging.h"
-#include "chrome/browser/ui/autofill/payments/webauthn_offer_dialog_controller.h"
+#include "chrome/browser/ui/autofill/payments/webauthn_offer_dialog_model.h"
 #include "chrome/browser/ui/views/webauthn/authenticator_ble_pin_entry_sheet_view.h"
 #include "chrome/browser/ui/views/webauthn/authenticator_client_pin_entry_sheet_view.h"
 #include "chrome/browser/ui/views/webauthn/authenticator_qr_sheet_view.h"
@@ -200,6 +200,6 @@ std::unique_ptr<AuthenticatorRequestSheetView> CreateSheetViewForCurrentStepOf(
 
 std::unique_ptr<AuthenticatorRequestSheetView>
 CreateSheetViewForAutofillWebAuthn(
-    std::unique_ptr<autofill::WebauthnOfferDialogController> controller) {
-  return std::make_unique<AuthenticatorRequestSheetView>(std::move(controller));
+    std::unique_ptr<autofill::WebauthnOfferDialogModel> model) {
+  return std::make_unique<AuthenticatorRequestSheetView>(std::move(model));
 }

chrome/browser/ui/views/webauthn/sheet_view_factory.h

@@ -11,7 +11,7 @@ class AuthenticatorRequestSheetView;
 class AuthenticatorRequestDialogModel;
 
 namespace autofill {
-class WebauthnOfferDialogController;
+class WebauthnOfferDialogModel;
 }
 
 // Creates the appropriate AuthenticatorRequestSheetView subclass instance,
@@ -24,6 +24,6 @@ std::unique_ptr<AuthenticatorRequestSheetView> CreateSheetViewForCurrentStepOf(
 // WebauthnOfferDialogView.
 std::unique_ptr<AuthenticatorRequestSheetView>
 CreateSheetViewForAutofillWebAuthn(
-    std::unique_ptr<autofill::WebauthnOfferDialogController> controller);
+    std::unique_ptr<autofill::WebauthnOfferDialogModel> model);
 
 #endif  // CHROME_BROWSER_UI_VIEWS_WEBAUTHN_SHEET_VIEW_FACTORY_H_

components/autofill/core/browser/autofill_client.cc

@@ -23,4 +23,8 @@ LogManager* AutofillClient::GetLogManager() const {
   return nullptr;
 }
 
+bool AutofillClient::CloseWebauthnOfferDialog() {
+  return false;
+}
+
 }  // namespace autofill

components/autofill/core/browser/autofill_client.h

@@ -311,6 +311,10 @@ class AutofillClient : public RiskDataLoader {
   virtual void ShowWebauthnOfferDialog(
       WebauthnOfferDialogCallback callback) = 0;
 
+  // Will close the WebAuthn offer dialog. Returns true if dialog was visible
+  // and has been closed. Implemented only on desktop.
+  virtual bool CloseWebauthnOfferDialog();
+
   // Runs |callback| if the |profile| should be imported as personal data.
   virtual void ConfirmSaveAutofillProfile(const AutofillProfile& profile,
                                           base::OnceClosure callback) = 0;

components/autofill/core/browser/payments/credit_card_fido_authenticator.cc

@@ -12,6 +12,7 @@
 #include "base/containers/flat_set.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
+#include "build/build_config.h"
 #include "components/autofill/core/browser/autofill_client.h"
 #include "components/autofill/core/browser/data_model/credit_card.h"
 #include "components/autofill/core/browser/payments/payments_client.h"
@@ -171,6 +172,16 @@ void CreditCardFIDOAuthenticator::MakeCredential(
     PublicKeyCredentialCreationOptionsPtr creation_options) {
   autofill_driver_->ConnectToAuthenticator(
       authenticator_.BindNewPipeAndPassReceiver());
+#if !defined(OS_ANDROID)
+  // On desktop, close the WebAuthn offer dialog and get ready to show the OS
+  // level authentication dialog. If dialog is already closed, then the offer
+  // was declined during the fetching challenge process, and thus returned
+  // early.
+  if (!autofill_client_->CloseWebauthnOfferDialog()) {
+    current_flow_ = NONE_FLOW;
+    return;
+  }
+#endif
   authenticator_->MakeCredential(
       std::move(creation_options),
       base::BindOnce(&CreditCardFIDOAuthenticator::OnDidMakeCredential,
@@ -253,8 +264,12 @@ void CreditCardFIDOAuthenticator::OnDidGetOptChangeResult(
 
 void CreditCardFIDOAuthenticator::OnWebauthnOfferDialogUserResponse(
     bool did_accept) {
-  // TODO(crbug.com/): Register and start fetching authentication challenge if
-  // |did_accept|, otherwise cancel any ongoing request.
+  if (did_accept) {
+    Register();
+  } else {
+    payments_client_->CancelRequest();
+    current_flow_ = NONE_FLOW;
+  }
 }
 
 void CreditCardFIDOAuthenticator::OnFullCardRequestSucceeded(

components/autofill/core/browser/test_autofill_client.cc

@@ -110,6 +110,10 @@ void TestAutofillClient::ShowLocalCardMigrationResults(
 void TestAutofillClient::ShowWebauthnOfferDialog(
     WebauthnOfferDialogCallback callback) {}
 
+bool TestAutofillClient::CloseWebauthnOfferDialog() {
+  return true;
+}
+
 void TestAutofillClient::ConfirmSaveAutofillProfile(
     const AutofillProfile& profile,
     base::OnceClosure callback) {

components/autofill/core/browser/test_autofill_client.h

@@ -65,6 +65,7 @@ class TestAutofillClient : public AutofillClient {
       const std::vector<MigratableCreditCard>& migratable_credit_cards,
       MigrationDeleteCardCallback delete_local_card_callback) override;
   void ShowWebauthnOfferDialog(WebauthnOfferDialogCallback callback) override;
+  bool CloseWebauthnOfferDialog() override;
   void ConfirmSaveAutofillProfile(const AutofillProfile& profile,
                                   base::OnceClosure callback) override;
   void ConfirmSaveCreditCardLocally(