Http Bad: Add a PopupItemId to identify http warning message

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 139 matching lines @@
     size_t index) const {
   std::vector<autofill::Suggestion> suggestions = delegate_->GetSuggestions();
 
   // Autofill values have positive |frontend_id|.
   if (suggestions[index].frontend_id > 0)
     return bold_font_list_;
 
   // All other message types are defined here.
   PopupItemId id = static_cast<PopupItemId>(suggestions[index].frontend_id);
   switch (id) {
-    case POPUP_ITEM_ID_WARNING_MESSAGE:
+    case POPUP_ITEM_ID_INSECURE_CONTEXT_PAYMENT_DISABLED_MESSAGE:
       return warning_font_list_;
+    case POPUP_ITEM_ID_HTTP_NOT_SECURE_WARNING_MESSAGE:
     case POPUP_ITEM_ID_CLEAR_FORM:
     case POPUP_ITEM_ID_CREDIT_CARD_SIGNIN_PROMO:
     case POPUP_ITEM_ID_AUTOFILL_OPTIONS:
     case POPUP_ITEM_ID_SCAN_CREDIT_CARD:
     case POPUP_ITEM_ID_SEPARATOR:
       return normal_font_list_;
     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 {
   return smaller_font_list_;
 }
+
+SkColor AutofillPopupLayoutModel::GetValueFontColorForRow(size_t index) const {
+  std::vector<autofill::Suggestion> suggestions = delegate_->GetSuggestions();
+  switch (suggestions[index].frontend_id) {

[csashi, 2016/11/17 01:41:31]

Because you only need the frontend_id would it be better to add a method to the
delegate like so:
GetFrontendId(int index);
Or, have a variation of GetSuggestions that returns a const ref. (we use
GetSuggestions in other places also). May be compiler optimizes this call too
but I am not sure.

[lshang, 2016/11/17 07:03:46]

Yes GetSuggestions() is used all over this file to get the frontend_id, so I
think it should be fine to do this. My guess is the suggestion list won't be too
long so it's ok to return the vector here.

+    case POPUP_ITEM_ID_HTTP_NOT_SECURE_WARNING_MESSAGE:
+      return kHttpWarningTextColor;
+    case POPUP_ITEM_ID_INSECURE_CONTEXT_PAYMENT_DISABLED_MESSAGE:
+      return kLabelTextColor;
+    default:
+      return kValueTextColor;
+  }
+}
 #endif
 
 int AutofillPopupLayoutModel::LineFromY(int y) const {
   std::vector<autofill::Suggestion> suggestions = delegate_->GetSuggestions();
   int current_height = kPopupBorderThickness;
 
   for (size_t i = 0; i < suggestions.size(); ++i) {
     current_height += GetRowHeightFromId(suggestions[i].frontend_id);
 
     if (y <= current_height)
@@ skipping 33 matching lines @@
 #endif
 
   return result;
 }
 
 const gfx::Rect AutofillPopupLayoutModel::RoundedElementBounds() const {
   return gfx::ToEnclosingRect(delegate_->element_bounds());
 }
 
 }  // namespace autofill