Expanded Autofill Credit Card Popup Layout Experiment in Android.

chrome/browser/ui/android/autofill/autofill_popup_view_android.cc

 // Copyright (c) 2012 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/autofill/autofill_popup_view_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/command_line.h"
 #include "chrome/browser/android/resource_mapper.h"
@@ skipping 76 matching lines @@
         base::android::ConvertUTF16ToJavaString(
             env, controller_->GetElidedLabelAt(i));
     int android_icon_id = 0;
 
     const Suggestion& suggestion = controller_->GetSuggestionAt(i);
     if (!suggestion.icon.empty()) {
       android_icon_id = ResourceMapper::MapFromChromiumId(
           controller_->layout_model().GetIconResourceID(suggestion.icon));
     }
 
-    bool deletable =
+    bool is_deletable =
         controller_->GetRemovalConfirmationText(i, nullptr, nullptr);
     bool is_label_multiline =
         suggestion.frontend_id ==
             POPUP_ITEM_ID_INSECURE_CONTEXT_PAYMENT_DISABLED_MESSAGE ||
         suggestion.frontend_id == POPUP_ITEM_ID_CREDIT_CARD_SIGNIN_PROMO;
     Java_AutofillPopupBridge_addToAutofillSuggestionArray(
         env, data_array, i, value, label, android_icon_id,
-        suggestion.frontend_id, deletable, is_label_multiline);
+        controller_->layout_model().IsIconAtStart(),

[Mathieu, 2016/12/08 18:35:10]

Can you pass |suggestion_id| to ..LayoutModel::IsIconAtStart, that way we can
remove the check in AutofillSuggestion.isIconAtStart that checks about the HTTP
ITEM_ID_HTTP_NOT_SECURE_WARNING_MESSAGE and rather have it in the layout model.

[csashi, 2016/12/08 20:09:01]

Done.

+        suggestion.frontend_id, is_deletable, is_label_multiline,
+        suggestion.is_value_bold);
   }
 
-  Java_AutofillPopupBridge_show(env, java_object_, data_array,
-                                controller_->IsRTL());
+  Java_AutofillPopupBridge_show(
+      env, java_object_, data_array, controller_->IsRTL(),
+      controller_->layout_model().GetBackgroundColor(),
+      controller_->layout_model().GetDividerColor(),
+      controller_->layout_model().GetDropdownItemHeight());
 }
 
 void AutofillPopupViewAndroid::SuggestionSelected(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     jint list_index) {
   // Race: Hide() may have already run.
   if (controller_)
     controller_->AcceptSuggestion(list_index);
 }
@@ skipping 47 matching lines @@
 // static
 AutofillPopupView* AutofillPopupView::Create(
     AutofillPopupController* controller) {
   if (IsKeyboardAccessoryEnabled())
     return new AutofillKeyboardAccessoryView(controller);
 
   return new AutofillPopupViewAndroid(controller);
 }
 
 }  // namespace autofill