Add card details and legal message to Android save credit card 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"
@@ skipping 35 matching lines @@
 #include "ui/gfx/geometry/rect.h"
 
 #if BUILDFLAG(ANDROID_JAVA_UI)
 #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/ui/zoom/zoom_controller.h"
 #endif
 
+#if defined(OS_ANDROID) || defined(OS_IOS)
+#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"
+#endif
+
 DEFINE_WEB_CONTENTS_USER_DATA_KEY(autofill::ChromeAutofillClient);
 
 namespace autofill {
 
 namespace {
 
 #if !defined(OS_ANDROID)
 bool IsSaveCardBubbleEnabled() {
 #if defined(OS_MACOSX)
   return base::CommandLine::ForCurrentProcess()->HasSwitch(
@@ skipping 101 matching lines @@
       CreateCardUnmaskPromptView(&unmask_controller_, web_contents()),
       card, delegate);
 }
 
 void ChromeAutofillClient::OnUnmaskVerificationResult(
     PaymentsRpcResult result) {
   unmask_controller_.OnVerificationResult(result);
 }
 
 void ChromeAutofillClient::ConfirmSaveCreditCardLocally(
+    const CreditCard& card,
     const base::Closure& callback) {
-#if !defined(OS_ANDROID)
+#if defined(OS_ANDROID) || defined(OS_IOS)
+  InfoBarService::FromWebContents(web_contents())->AddInfoBar(
+      CreateSaveCardInfoBarMobile(
+          make_scoped_ptr(new AutofillSaveCardInfoBarDelegateMobile(
+              false, card, scoped_ptr<base::DictionaryValue>(nullptr),
+              callback))));
+#else
   if (IsSaveCardBubbleEnabled()) {
     // Do lazy initialization of SaveCardBubbleControllerImpl.
     autofill::SaveCardBubbleControllerImpl::CreateForWebContents(
         web_contents());
     autofill::SaveCardBubbleControllerImpl* controller =
         autofill::SaveCardBubbleControllerImpl::FromWebContents(web_contents());
     controller->ShowBubbleForLocalSave(callback);
     return;
   }
-#endif
+
   AutofillCCInfoBarDelegate::CreateForLocalSave(
       InfoBarService::FromWebContents(web_contents()), callback);
+#endif  // defined(OS_ANDROID) || defined(OS_IOS)
 }
 
 void ChromeAutofillClient::ConfirmSaveCreditCardToCloud(
-    const base::Closure& callback,
-    scoped_ptr<base::DictionaryValue> legal_message) {
-// TODO(jdonnelly): Implement save card prompt for OS_IOS.
-#if defined(OS_ANDROID)
-  AutofillCCInfoBarDelegate::CreateForUpload(
-      InfoBarService::FromWebContents(web_contents()), callback);
+    const CreditCard& card,
+    scoped_ptr<base::DictionaryValue> legal_message,
+    const base::Closure& callback) {
+#if defined(OS_ANDROID) || defined(OS_IOS)
+  InfoBarService::FromWebContents(web_contents())->AddInfoBar(
+      CreateSaveCardInfoBarMobile(
+          make_scoped_ptr(new AutofillSaveCardInfoBarDelegateMobile(
+              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(callback, std::move(legal_message));
-#endif
+#endif  // defined(OS_ANDROID) || defined(OS_IOS)

[Evan Stade, 2016/01/13 04:09:19]

I never know what these comments mean, whether they're referring to the block
above or some block further up the macro conditional chain. As such I think
they're actively hurtful.

[please use gerrit instead, 2016/01/13 21:22:09]

Removed.

 }
 
 void ChromeAutofillClient::LoadRiskData(
     const base::Callback<void(const std::string&)>& callback) {
   ::autofill::LoadRiskData(0, web_contents(), callback);
 }
 
 bool ChromeAutofillClient::HasCreditCardScanFeature() {
   return CreditCardScannerController::HasCreditCardScanFeature();
 }
@@ skipping 142 matching lines @@
 
   ssl_status = navigation_entry->GetSSL();
   // Note: If changing the implementation below, also change
   // AwAutofillClient::IsContextSecure. See crbug.com/505388
   return ssl_status.security_style ==
       content::SECURITY_STYLE_AUTHENTICATED &&
       ssl_status.content_status == content::SSLStatus::NORMAL_CONTENT;
 }
 
 }  // namespace autofill