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

chrome/browser/ui/autofill/autofill_popup_layout_model.cc

 // 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.
 
 #include "chrome/browser/ui/autofill/autofill_popup_layout_model.h"
 
 #include <algorithm>
 
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 93 matching lines @@
 
     popup_width = std::max(popup_width, row_size);
   }
 
   return popup_width;
 }
 
 int AutofillPopupLayoutModel::RowWidthWithoutText(int row,
                                                   bool with_label) const {
   std::vector<autofill::Suggestion> suggestions = delegate_->GetSuggestions();
+  bool isWarningMessage = (suggestions[row].frontend_id ==
+                           POPUP_ITEM_ID_HTTP_NOT_SECURE_WARNING_MESSAGE);
 
   int row_size = kEndPadding;
 
   if (with_label)
-    row_size += kNamePadding;
+    row_size += isWarningMessage ? kHttpWarningNamePadding : kNamePadding;
 
   // Add the Autofill icon size, if required.
   const base::string16& icon = suggestions[row].icon;
   if (!icon.empty()) {
     int icon_width = ui::ResourceBundle::GetSharedInstance()
                          .GetImageNamed(GetIconResourceID(icon))
                          .Width();
-    row_size += icon_width + kIconPadding;
+    row_size += isWarningMessage ? icon_width + kHttpWarningIconPadding
+                                 : icon_width + kIconPadding;
   }
 
   // Add the padding at the end.
   row_size += kEndPadding;
 
   // Add room for the popup border.
   row_size += 2 * kPopupBorderThickness;
 
   return row_size;
 }
@@ skipping 35 matching lines @@
     case POPUP_ITEM_ID_TITLE:
     case POPUP_ITEM_ID_AUTOCOMPLETE_ENTRY:
     case POPUP_ITEM_ID_DATALIST_ENTRY:
     case POPUP_ITEM_ID_PASSWORD_ENTRY:
       return bold_font_list_;
   }
   NOTREACHED();
   return normal_font_list_;
 }
 
-const gfx::FontList& AutofillPopupLayoutModel::GetLabelFontList() const {
+const gfx::FontList& AutofillPopupLayoutModel::GetLabelFontListForRow(
+    size_t index) const {
+  std::vector<autofill::Suggestion> suggestions = delegate_->GetSuggestions();
+  PopupItemId id = static_cast<PopupItemId>(suggestions[index].frontend_id);
+  if (id == POPUP_ITEM_ID_HTTP_NOT_SECURE_WARNING_MESSAGE)

[Mathieu, 2016/11/22 14:36:45]

curious, can't you do

if (suggestions[index].frontend_id == POPUP_ITEM...) ?

[lshang, 2016/11/27 04:59:13]

Done.

+    return normal_font_list_;
+
   return smaller_font_list_;
 }
 
 SkColor AutofillPopupLayoutModel::GetValueFontColorForRow(size_t index) const {
   std::vector<autofill::Suggestion> suggestions = delegate_->GetSuggestions();
   switch (suggestions[index].frontend_id) {
     case POPUP_ITEM_ID_HTTP_NOT_SECURE_WARNING_MESSAGE:
       return gfx::kGoogleRed700;
     case POPUP_ITEM_ID_INSECURE_CONTEXT_PAYMENT_DISABLED_MESSAGE:
       return kLabelTextColor;
@@ skipping 47 matching lines @@
 #endif
 
   return result;
 }
 
 const gfx::Rect AutofillPopupLayoutModel::RoundedElementBounds() const {
   return gfx::ToEnclosingRect(delegate_->element_bounds());
 }
 
 }  // namespace autofill