Add card details and legal message to Android save credit card infobar.

chrome/browser/ui/android/infobars/confirm_infobar.cc

 // Copyright 2013 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/android/infobars/confirm_infobar.h"
 
 #include <vector>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/logging.h"
 #include "build/build_config.h"
 #include "chrome/browser/android/resource_mapper.h"
 #include "chrome/browser/infobars/infobar_service.h"
+#include "chrome/browser/media/media_stream_infobar_delegate_android.h"
 #include "chrome/browser/permissions/permission_infobar_delegate.h"
 #include "components/content_settings/core/common/content_settings_types.h"
 #include "components/infobars/core/confirm_infobar_delegate.h"
 #include "content/public/browser/android/content_view_core.h"
 #include "content/public/browser/web_contents.h"
 #include "jni/ConfirmInfoBarDelegate_jni.h"
 #include "ui/android/window_android.h"
 #include "ui/gfx/android/java_bitmap.h"
 #include "ui/gfx/image/image.h"
 
-#if defined(OS_ANDROID)
-#include "chrome/browser/media/media_stream_infobar_delegate_android.h"
-#endif
-
 // InfoBarService -------------------------------------------------------------
 
 scoped_ptr<infobars::InfoBar> InfoBarService::CreateConfirmInfoBar(
     scoped_ptr<ConfirmInfoBarDelegate> delegate) {
   return make_scoped_ptr(new ConfirmInfoBar(delegate.Pass()));
 }
 
 
 // ConfirmInfoBar -------------------------------------------------------------
 
@@ skipping 14 matching lines @@
       base::android::ConvertUTF16ToJavaString(
           env, GetTextFor(ConfirmInfoBarDelegate::BUTTON_CANCEL));
   ConfirmInfoBarDelegate* delegate = GetDelegate();
   base::android::ScopedJavaLocalRef<jstring> message_text =
       base::android::ConvertUTF16ToJavaString(
           env, delegate->GetMessageText());
   base::android::ScopedJavaLocalRef<jstring> link_text =
       base::android::ConvertUTF16ToJavaString(
           env, delegate->GetLinkText());
 
+  for (const auto& detail : delegate->GetDetails()) {
+    Java_ConfirmInfoBarDelegate_addDetail(
+        env, java_confirm_delegate_.obj(),
+        ResourceMapper::MapFromChromiumId(detail.icon_id),
+        base::android::ConvertUTF16ToJavaString(env, detail.label).obj(),
+        base::android::ConvertUTF16ToJavaString(env, detail.sub_label).obj());
+  }
+
+  for (const auto& description : delegate->GetDescriptions()) {
+    Java_ConfirmInfoBarDelegate_addDescription(
+        env, java_confirm_delegate_.obj(),
+        base::android::ConvertUTF16ToJavaString(env, description.text).obj());
+    for (const auto& link : description.links) {
+      Java_ConfirmInfoBarDelegate_addLinkToLastDescription(
+          env, java_confirm_delegate_.obj(), link.start, link.end,
+          base::android::ConvertUTF8ToJavaString(env, link.url.spec()).obj());
+    }
+  }
+
   ScopedJavaLocalRef<jobject> java_bitmap;
   if (delegate->GetIconId() == infobars::InfoBarDelegate::kNoIconID &&
       !delegate->GetIcon().IsEmpty()) {
     java_bitmap = gfx::ConvertToJavaBitmap(delegate->GetIcon().ToSkBitmap());
   }
 
   std::vector<int> content_settings;
   if (delegate->AsPermissionInfobarDelegate()) {
     content_settings.push_back(
         delegate->AsPermissionInfobarDelegate()->content_setting());
-#if defined(OS_ANDROID)
   } else if (delegate->AsMediaStreamInfoBarDelegateAndroid()) {
     MediaStreamInfoBarDelegateAndroid* media_delegate =
         delegate->AsMediaStreamInfoBarDelegateAndroid();
     if (media_delegate->IsRequestingVideoAccess()) {
       content_settings.push_back(
           ContentSettingsType::CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA);
     }
     if (media_delegate->IsRequestingMicrophoneAccess()) {
       content_settings.push_back(
           ContentSettingsType::CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC);
     }
-#endif
   }
 
   content::WebContents* web_contents =
       InfoBarService::WebContentsFromInfoBar(this);
   DCHECK(web_contents);
   content::ContentViewCore* cvc =
       content::ContentViewCore::FromWebContents(web_contents);
   DCHECK(cvc);
   base::android::ScopedJavaLocalRef<jobject> jwindow_android =
       cvc->GetWindowAndroid()->GetJavaObject();
@@ skipping 37 matching lines @@
   return (delegate->GetButtons() & button) ?
       delegate->GetButtonLabel(button) : base::string16();
 }
 
 
 // Native JNI methods ---------------------------------------------------------
 
 bool RegisterConfirmInfoBarDelegate(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }