Tweak payment autofill disabled message in form-not-secure

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 273 matching lines @@
 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_INSECURE_CONTEXT_PAYMENT_DISABLED_MESSAGE ||
          suggestions_[index].frontend_id ==
+             POPUP_ITEM_ID_PAYMENT_DISABLED_MESSAGE ||
+         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 153 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_PAYMENT_DISABLED_MESSAGE &&
          id != POPUP_ITEM_ID_INSECURE_CONTEXT_PAYMENT_DISABLED_MESSAGE &&
          id != POPUP_ITEM_ID_TITLE;
 }
 
 bool AutofillPopupControllerImpl::HasSuggestions() {
   if (suggestions_.empty())
     return false;
   int id = suggestions_[0].frontend_id;
   return id > 0 ||
          id == POPUP_ITEM_ID_AUTOCOMPLETE_ENTRY ||
@@ skipping 59 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