[Merge M57] Use uniform margin for icon, label and sublabel

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 100 matching lines @@
         env, data_array, i, value, label, android_icon_id,
         controller_->layout_model().IsIconAtStart(suggestion.frontend_id),
         suggestion.frontend_id, is_deletable, is_label_multiline,
         suggestion.is_value_bold);
   }
 
   Java_AutofillPopupBridge_show(
       env, java_object_, data_array, controller_->IsRTL(),
       controller_->layout_model().GetBackgroundColor(),
       controller_->layout_model().GetDividerColor(),
-      controller_->layout_model().GetDropdownItemHeight());
+      controller_->layout_model().GetDropdownItemHeight(),
+      controller_->layout_model().GetMargin());
 }
 
 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