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

chrome/browser/ui/autofill/autofill_popup_layout_model.h

 // Copyright (c) 2016 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.
 
 #ifndef CHROME_BROWSER_UI_AUTOFILL_AUTOFILL_POPUP_LAYOUT_MODEL_H_
 #define CHROME_BROWSER_UI_AUTOFILL_AUTOFILL_POPUP_LAYOUT_MODEL_H_
 
 #include <stddef.h>
 
 #include "base/strings/string16.h"
@@ skipping 98 matching lines @@
   // layout.
   SkColor GetDividerColor() const;
 
   // Returns the dropdown item height, or 0 if the dropdown item height isn't
   // configured in an experiment to tweak autofill popup layout.
   unsigned int GetDropdownItemHeight() const;
 
   // Returns true if suggestion icon must be displayed before suggestion text.
   bool IsIconAtStart(int frontend_id) const;
 
+  // Returns the margin for icon, label and between icon and label, or 0 if the
+  // margin isn't configured in an experiment to tweak autofill popup layout.
+  unsigned int GetMargin() const;
+
  private:
   // Returns the enclosing rectangle for the element_bounds.
   const gfx::Rect RoundedElementBounds() const;
 
 #if !defined(OS_ANDROID)
   // The fonts for the popup text.
   // Normal font (readable size, non bold).
   gfx::FontList normal_font_list_;
   // Slightly smaller than the normal font.
   gfx::FontList smaller_font_list_;
   // Bold version of the normal font.
   gfx::FontList bold_font_list_;
 #endif
 
   // The bounds of the Autofill popup.
   gfx::Rect popup_bounds_;
 
   PopupViewCommon view_common_;
 
   AutofillPopupViewDelegate* delegate_;  // Weak reference.
 
   const bool is_credit_card_popup_;
 
   DISALLOW_COPY_AND_ASSIGN(AutofillPopupLayoutModel);
 };
 
 }  // namespace autofill
 
 #endif  // CHROME_BROWSER_UI_AUTOFILL_AUTOFILL_POPUP_LAYOUT_MODEL_H_