[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 {
 
 ChromeAutofillClient::ChromeAutofillClient(content::WebContents* web_contents)
     : content::WebContentsObserver(web_contents),
       unmask_controller_(
           user_prefs::UserPrefs::Get(web_contents->GetBrowserContext()),
           Profile::FromBrowserContext(web_contents->GetBrowserContext())
-              ->IsOffTheRecord()) {
+              ->IsOffTheRecord()),
+      weak_ptr_factory_(this) {
   DCHECK(web_contents);
 
 #if !BUILDFLAG(ANDROID_JAVA_UI)
   // Since ZoomController is also a WebContentsObserver, we need to be careful
   // about disconnecting from it since the relative order of destruction of
   // WebContentsObservers is not guaranteed. ZoomController silently clears
   // its ZoomObserver list during WebContentsDestroyed() so there's no need
   // to explicitly remove ourselves on destruction.
   zoom::ZoomController* zoom_controller =
       zoom::ZoomController::FromWebContents(web_contents);
@@ skipping 113 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)
+  AutofillCreditCardFillingInfoBarDelegateMobile::Create(

[Evan Stade, 2016/08/02 13:46:41]

is it possible to avoid adding CreateCreditCardFillingInfoBar() to the
interface? It seems a little like a game of hot potato the way you're passing
card and callback back and forth, plus desktop is never going to want an infobar
(I assume it will use some other UI surface like a bubble). I'm ok with a
generic thing like ConfirmCCFillAssist but CreateInfoBar is a bit specific.

Perhaps the easiest way to fix this would be to move the body of
AutofillCreditCardFillingInfoBarDelegateMobile::Create() here.

+      InfoBarService::FromWebContents(web_contents()),
+      weak_ptr_factory_.GetWeakPtr(), card, callback);
+#endif
+}
+
+#if defined(OS_ANDROID)
+std::unique_ptr<infobars::InfoBar>
+ChromeAutofillClient::CreateCreditCardFillingInfoBar(
+    std::unique_ptr<AutofillCreditCardFillingInfoBarDelegateMobile> delegate) {
+  return base::WrapUnique(
+      new AutofillCreditCardFillingInfoBar(std::move(delegate)));
+}
+#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