[Autofill Assistant] Rename 'show_attribution' to 'allow_image_clickthrough'.

Refactor to make code more understandable.

Change-Id: I1439547ccbde474bf007adfea06748dc11b17ab1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1546786Reviewed-by: Jordan Demeulenaere <jdemeulenaere@chromium.org>
Commit-Queue: Hui Wu <wuandy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#646471}

chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/details/AssistantDetails.java

@@ -24,7 +24,7 @@ public class AssistantDetails {
 
     private final String mTitle;
     private final String mImageUrl;
-    private final boolean mShowAttribution;
+    private final boolean mAllowImageClickthrough;
     private final boolean mShowImagePlaceholder;
     @Nullable
     private final Date mDate;
@@ -48,7 +48,7 @@ public class AssistantDetails {
     /** An optional price label, such as 'Estimated Total incl. VAT'. */
     private final String mTotalPriceLabel;
 
-    public AssistantDetails(String title, String imageUrl, boolean showAttribution,
+    public AssistantDetails(String title, String imageUrl, boolean allowImageClickthrough,
             boolean showImagePlaceholder, String totalPriceLabel, String totalPrice,
             @Nullable Date date, String descriptionLine1, String descriptionLine2,
             boolean userApprovalRequired, boolean highlightTitle, boolean highlightLine1,
@@ -56,7 +56,7 @@ public class AssistantDetails {
         this.mTotalPriceLabel = totalPriceLabel;
         this.mTitle = title;
         this.mImageUrl = imageUrl;
-        this.mShowAttribution = showAttribution;
+        this.mAllowImageClickthrough = allowImageClickthrough;
         this.mShowImagePlaceholder = showImagePlaceholder;
         this.mTotalPrice = totalPrice;
         this.mDate = date;
@@ -78,8 +78,8 @@ public class AssistantDetails {
         return mImageUrl;
     }
 
-    boolean getShowAttribution() {
-        return mShowAttribution;
+    boolean getAllowImageClickthrough() {
+        return mAllowImageClickthrough;
     }
 
     boolean getShowImagePlaceholder() {
@@ -131,12 +131,12 @@ public class AssistantDetails {
      * Create details with the given values.
      */
     @CalledByNative
-    private static AssistantDetails create(String title, String imageUrl, boolean showAttribution,
-            boolean showImagePlaceholder, String totalPriceLabel, String totalPrice,
-            String datetime, long year, int month, int day, int hour, int minute, int second,
-            String descriptionLine1, String descriptionLine2, boolean userApprovalRequired,
-            boolean highlightTitle, boolean highlightLine1, boolean highlightLine2,
-            boolean animatePlaceholders) {
+    private static AssistantDetails create(String title, String imageUrl,
+            boolean allowImageClickthrough, boolean showImagePlaceholder, String totalPriceLabel,
+            String totalPrice, String datetime, long year, int month, int day, int hour, int minute,
+            int second, String descriptionLine1, String descriptionLine2,
+            boolean userApprovalRequired, boolean highlightTitle, boolean highlightLine1,
+            boolean highlightLine2, boolean animatePlaceholders) {
         Date date = null;
         if (year > 0 && month > 0 && day > 0 && hour >= 0 && minute >= 0 && second >= 0) {
             Calendar calendar = Calendar.getInstance();
@@ -155,7 +155,7 @@ public class AssistantDetails {
             }
         }
 
-        return new AssistantDetails(title, imageUrl, showAttribution, showImagePlaceholder,
+        return new AssistantDetails(title, imageUrl, allowImageClickthrough, showImagePlaceholder,
                 totalPriceLabel, totalPrice, date, descriptionLine1, descriptionLine2,
                 userApprovalRequired, highlightTitle, highlightLine1, highlightLine2,
                 animatePlaceholders);

chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/details/AssistantDetailsViewBinder.java

@@ -160,7 +160,7 @@ class AssistantDetailsViewBinder
                     CachedImageFetcher.ASSISTANT_DETAILS_UMA_CLIENT_NAME, image -> {
                         if (image != null) {
                             viewHolder.mImageView.setImageDrawable(getRoundedImage(image));
-                            if (details.getShowAttribution()) {
+                            if (details.getAllowImageClickthrough()) {
                                 viewHolder.mImageView.setOnClickListener(unusedView
                                         -> onImageClicked(mContext, details.getImageUrl()));
                             } else {

chrome/android/features/autofill_assistant/javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantUiTest.java

@@ -168,7 +168,7 @@ public class AutofillAssistantUiTest {
                         -> assistantCoordinator.getModel().getDetailsModel().set(
                                 AssistantDetailsModel.DETAILS,
                                 new AssistantDetails(movieTitle, /* imageUrl = */ "",
-                                        /* showAttribution = */ false,
+                                        /* allowImageClickThrough = */ false,
                                         /* showImage = */ false,
                                         /* totalPriceLabel = */ "",
                                         /* totalPrice = */ "", Calendar.getInstance().getTime(),

chrome/browser/android/autofill_assistant/ui_controller_android.cc

@@ -622,7 +622,7 @@ void UiControllerAndroid::OnDetailsChanged(const Details* details) {
   auto jdetails = Java_AssistantDetails_create(
       env, base::android::ConvertUTF8ToJavaString(env, proto.title()),
       base::android::ConvertUTF8ToJavaString(env, proto.image_url()),
-      proto.show_attribution(), proto.show_image_placeholder(),
+      proto.allow_image_clickthrough(), proto.show_image_placeholder(),
       base::android::ConvertUTF8ToJavaString(env, proto.total_price_label()),
       base::android::ConvertUTF8ToJavaString(env, proto.total_price()),
       base::android::ConvertUTF8ToJavaString(env, details->GetDatetime()),

components/autofill_assistant/browser/service.proto

@@ -742,7 +742,7 @@ message DetailsProto {
 
   // Whether to show the original URL where image is extracted from. Only useful
   // when 'image_url' is set.
-  optional bool show_attribution = 12;
+  optional bool allow_image_clickthrough = 12;
 
   // Optional label to provide additional price information.
   optional string total_price_label = 9;