Http Bad: Add a PopupItemId to identify http warning message

chrome/browser/ui/autofill/autofill_popup_controller_impl.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/autofill/autofill_popup_controller_impl.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/command_line.h"
@@ skipping 270 matching lines @@
   SetSelectedLine(kNoSelection);
 }
 
 void AutofillPopupControllerImpl::AcceptSuggestion(size_t index) {
   const autofill::Suggestion& suggestion = suggestions_[index];
   delegate_->DidAcceptSuggestion(suggestion.value, suggestion.frontend_id,
                                  index);
 }
 
 bool AutofillPopupControllerImpl::IsWarning(size_t index) const {
-  return suggestions_[index].frontend_id == POPUP_ITEM_ID_WARNING_MESSAGE;
+  return suggestions_[index].frontend_id == POPUP_ITEM_ID_WARNING_MESSAGE ||

[Mathieu, 2016/11/12 12:52:05]

this warning item id now becomes oddly non-specific. Please rename to
POPUP_ITEM_ID_INSECURE_CONTEXT_PAYMENT_DISABLED_MESSAGE or something.

[lshang, 2016/11/14 10:51:01]

Done.

+         suggestions_[index].frontend_id ==
+             POPUP_ITEM_ID_HTTP_NOT_SECURE_WARNING_MESSAGE;
 }
 
 gfx::Rect AutofillPopupControllerImpl::popup_bounds() const {
   return layout_model_.popup_bounds();
 }
 
 content::WebContents* AutofillPopupControllerImpl::web_contents() {
   return controller_common_->web_contents();
 }
 
@@ skipping 77 matching lines @@
   return true;
 }
 
 SkColor AutofillPopupControllerImpl::GetBackgroundColorForRow(int index) const {
   if (index == selected_line_)
     return kHoveredBackgroundColor;
 
   return SK_ColorTRANSPARENT;
 }
 
+SkColor AutofillPopupControllerImpl::GetTextColorForRow(int index) const {
+  if (suggestions_[index].frontend_id ==
+      autofill::POPUP_ITEM_ID_HTTP_NOT_SECURE_WARNING_MESSAGE)
+    return kHttpWarningTextColor;
+
+  return IsWarning(index) ? kLabelTextColor : kValueTextColor;

[Mathieu, 2016/11/12 12:52:05]

Remove the IsWarning function completely (it was only used in one place and
GetValueFontColorForRow can replace its functionality.

switch (suggestions_[index].frontend_id) {
  case POPUP_ITEM_ID_HTTP_NOT_SECURE_WARNING_MESSAGE:
    return kHttpsWarningTextColor;
  case POPUP_ITEM_ID_INSECURE_CONTEXT_PAYMENT_DISABLED_MESSAGE:
    return kLabelTextColor;
  default:
    return kValueTextColor;
}

[lshang, 2016/11/14 10:51:01]

Done.

+}
+
 int AutofillPopupControllerImpl::selected_line() const {
   return selected_line_;
 }
 
 const AutofillPopupLayoutModel& AutofillPopupControllerImpl::layout_model()
     const {
   return layout_model_;
 }
 
 void AutofillPopupControllerImpl::SetSelectedLine(int selected_line) {
@@ skipping 55 matching lines @@
   if (selected_line_ == kNoSelection)
     return false;
 
   DCHECK_GE(selected_line_, 0);
   DCHECK_LT(selected_line_, static_cast<int>(GetLineCount()));
   return RemoveSuggestion(selected_line_);
 }
 
 bool AutofillPopupControllerImpl::CanAccept(int id) {
   return id != POPUP_ITEM_ID_SEPARATOR && id != POPUP_ITEM_ID_WARNING_MESSAGE &&
-         id != POPUP_ITEM_ID_TITLE;
+         id != POPUP_ITEM_ID_TITLE &&
+         id != POPUP_ITEM_ID_HTTP_NOT_SECURE_WARNING_MESSAGE;

[Mathieu, 2016/11/12 12:52:05]

shouldn't the row be clickable? if so, but a TODO to change this

[lshang, 2016/11/14 10:51:01]

Yeah we need it to direct to a help center page. A TODO is added here.

 }
 
 bool AutofillPopupControllerImpl::HasSuggestions() {
   if (suggestions_.empty())
     return false;
   int id = suggestions_[0].frontend_id;
   return id > 0 ||
          id == POPUP_ITEM_ID_AUTOCOMPLETE_ENTRY ||
          id == POPUP_ITEM_ID_PASSWORD_ENTRY ||
          id == POPUP_ITEM_ID_DATALIST_ENTRY ||
@@ skipping 57 matching lines @@
   // Don't clear view_, because otherwise the popup will have to get regenerated
   // and this will cause flickering.
   suggestions_.clear();
   elided_values_.clear();
   elided_labels_.clear();
 
   selected_line_ = kNoSelection;
 }
 
 }  // namespace autofill