Http Bad: Put icon on the left of http warning message on Views

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 20 matching lines @@
 // TODO(mathp): investigate moving ownership of this class to the view.
 class AutofillPopupLayoutModel {
  public:
   explicit AutofillPopupLayoutModel(AutofillPopupViewDelegate* delegate);
   ~AutofillPopupLayoutModel();
 
   // The minimum amount of padding between the Autofill name and subtext,
   // in pixels.
   static const int kNamePadding = 15;
 
+  // The minimum amount of padding between the Autofill http warning message
+  // name and subtext, in pixels.
+  static const int kHttpWarningNamePadding = 8;
+
   // The amount of padding between icons in pixels.
   static const int kIconPadding = 5;
 
+  // The amount of padding between icons in pixels.
+  static const int kHttpWarningIconPadding = 8;

[Evan Stade, 2016/11/29 15:43:17]

I'm confused by this for two reasons - first because the comment is identical to
the above, and second because I didn't know there could be more than one icon
("between icons")

[lshang, 2016/11/30 05:43:36]

I advised the comments a bit to make it more clear. Are you OK with the new
version?

+
   // The amount of padding at the end of the popup in pixels.
   static const int kEndPadding = 8;
 
 #if !defined(OS_ANDROID)
   // Calculates the desired height of the popup based on its contents.
   int GetDesiredPopupHeight() const;
 
   // Calculates the desired width of the popup based on its contents.
   int GetDesiredPopupWidth() const;
 
   // Calculate the width of the row, excluding all the text. This provides
   // the size of the row that won't be reducible (since all the text can be
   // elided if there isn't enough space). |with_label| indicates whether a label
   // is expected to be present.
   int RowWidthWithoutText(int row, bool with_label) const;
 
   // Get the available space for the total text width. |with_label| indicates
   // whether a label is expected to be present.
   int GetAvailableWidthForRow(int row, bool with_label) const;
 
   // Calculates and sets the bounds of the popup, including placing it properly
   // to prevent it from going off the screen.
   void UpdatePopupBounds();
 
   // The same font can vary based on the type of data it is showing at the row
   // |index|.
   const gfx::FontList& GetValueFontListForRow(size_t index) const;
-  const gfx::FontList& GetLabelFontList() const;
+  const gfx::FontList& GetLabelFontListForRow(size_t index) const;
 
   // Returns the value font color of the row item according to its |index|.
   SkColor GetValueFontColorForRow(size_t index) const;
 
   // Returns the icon image of the item at |index| in the popup.
   gfx::ImageSkia GetIconImage(size_t index) const;
 #endif
 
   // Convert a y-coordinate to the closest line.
   int LineFromY(int y) const;
@@ skipping 31 matching lines @@
   PopupViewCommon view_common_;
 
   AutofillPopupViewDelegate* delegate_;  // Weak reference.
 
   DISALLOW_COPY_AND_ASSIGN(AutofillPopupLayoutModel);
 };
 
 }  // namespace autofill
 
 #endif  // CHROME_BROWSER_UI_AUTOFILL_AUTOFILL_POPUP_LAYOUT_MODEL_H_