[Autofill] Credit Card Assist Infobar

chrome/browser/ui/autofill/chrome_autofill_client.cc

 // Copyright 2014 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/chrome_autofill_client.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "build/build_config.h"
 #include "chrome/browser/autofill/personal_data_manager_factory.h"
 #include "chrome/browser/autofill/risk_util.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/password_manager/chrome_password_manager_client.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/signin/signin_promo_util.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/ui/autofill/autofill_popup_controller_impl.h"
 #include "chrome/browser/ui/autofill/create_card_unmask_prompt_view.h"
 #include "chrome/browser/ui/autofill/credit_card_scanner_controller.h"
@@ skipping 27 matching lines @@
 #include "chrome/browser/android/chrome_application.h"
 #include "chrome/browser/ui/android/autofill/autofill_logger_android.h"
 #else
 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h"
 #include "components/zoom/zoom_controller.h"
 #endif
 
 #if defined(OS_ANDROID)
 #include "base/android/context_utils.h"
 #include "chrome/browser/android/signin/signin_promo_util_android.h"
+#include "chrome/browser/infobars/infobar_service.h"
+#include "chrome/browser/ui/android/infobars/autofill_credit_card_filling_infobar.h"
+#include "components/autofill/core/browser/autofill_credit_card_filling_infobar_delegate_mobile.h"
 #include "components/autofill/core/browser/autofill_save_card_infobar_delegate_mobile.h"
 #include "components/autofill/core/browser/autofill_save_card_infobar_mobile.h"
 #include "components/infobars/core/infobar.h"
 #include "content/public/browser/android/content_view_core.h"
 #endif
 
 DEFINE_WEB_CONTENTS_USER_DATA_KEY(autofill::ChromeAutofillClient);
 
 namespace autofill {
 
@@ skipping 129 matching lines @@
               true, card, std::move(legal_message), callback))));
 #else
   // Do lazy initialization of SaveCardBubbleControllerImpl.
   autofill::SaveCardBubbleControllerImpl::CreateForWebContents(web_contents());
   autofill::SaveCardBubbleControllerImpl* controller =
       autofill::SaveCardBubbleControllerImpl::FromWebContents(web_contents());
   controller->ShowBubbleForUpload(card, std::move(legal_message), callback);
 #endif
 }
 
+void ChromeAutofillClient::ConfirmCreditCardFillAssist(
+    const CreditCard& card,
+    const base::Closure& callback) {
+#if defined(OS_ANDROID)

[Peter Kasting, 2016/08/03 02:25:40]

If it's really true that desktop is "never going to want an infobar", as Evan
said, why is AutofillCreditCardFillingInfoBarDelegateMobile even defined in
components/ to begin with?  Why isn't it defined on the embedder side, in
Android-specific files?  This would allow you to implement the Create() function
in the way I asked without having to make a complicated, multi-hop system of
calls back and forth across the component interface, and without having to add
things like set_was_shown().

[Mathieu, 2016/08/03 18:34:44]

I would like to keep the delegate inside components/ because it will be reused
for iOS, similar to how the "save card" infobar delegate is reused across mobile
platforms (with the platform-specific infobar instantiation code in their
appropriate directories). I think this way is good.

+  std::unique_ptr<infobars::InfoBar> infobar(
+      base::WrapUnique(new AutofillCreditCardFillingInfoBar(

[Peter Kasting, 2016/08/03 02:25:40]

Nit: Use MakeUnique in newly-written code (WrapUnique is mostly for
auto-conversions).

[Mathieu, 2016/08/03 18:34:44]

Done.

+          base::WrapUnique(new AutofillCreditCardFillingInfoBarDelegateMobile(
+              card, callback)))));
+  if (infobar) {
+    infobars::InfoBar* added_infobar =
+        InfoBarService::FromWebContents(web_contents())
+            ->AddInfoBar(std::move(infobar));
+    if (added_infobar) {
+      static_cast<AutofillCreditCardFillingInfoBarDelegateMobile*>(

[Peter Kasting, 2016/08/03 02:25:40]

Nit: Just save this raw pointer off when you first create the delegate, before
passing to the infobar:

  auto infobar_delegate = ...;
  auto* raw_delegate = infobar_delegate.get();
  ...;
  raw_delegate->set_was_shown(true);

[Mathieu, 2016/08/03 18:34:44]

Done.

+          added_infobar->delegate())
+          ->set_was_shown(true);
+    }
+  }
+#endif
+}
+
 void ChromeAutofillClient::LoadRiskData(
     const base::Callback<void(const std::string&)>& callback) {
   ::autofill::LoadRiskData(0, web_contents(), callback);
 }
 
 bool ChromeAutofillClient::HasCreditCardScanFeature() {
   return CreditCardScannerController::HasCreditCardScanFeature();
 }
 
 void ChromeAutofillClient::ScanCreditCard(
@@ skipping 140 matching lines @@
   chrome::FindBrowserWithWebContents(web_contents())
       ->window()
       ->ShowAvatarBubbleFromAvatarButton(
           BrowserWindow::AVATAR_BUBBLE_MODE_SIGNIN,
           signin::ManageAccountsParams(),
           signin_metrics::AccessPoint::ACCESS_POINT_AUTOFILL_DROPDOWN);
 #endif
 }
 
 }  // namespace autofill