AutoFill: Display a right-aligned generic CC icon in the suggestions popup for

chrome/browser/renderer_host/render_view_host.cc

 // Copyright (c) 2010 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/renderer_host/render_view_host.h"
 
 #include <string>
 #include <utility>
 #include <vector>
 
@@ skipping 1592 matching lines @@
   // the render view.
   if (autofill_delegate &&
       autofill_delegate->GetAutoFillSuggestions(query_id,
                                                 form_autofilled,
                                                 field)) {
   } else {
     // No suggestions provided, so supply an empty vector as the results.
     AutoFillSuggestionsReturned(query_id,
                                 std::vector<string16>(),
                                 std::vector<string16>(),
+                                std::vector<string16>(),
                                 std::vector<int>());
   }
 
   RenderViewHostDelegate::Autocomplete* autocomplete_delegate =
       delegate_->GetAutocompleteDelegate();
   if (autocomplete_delegate &&
       autocomplete_delegate->GetAutocompleteSuggestions(
           query_id, field.name(), field.value())) {
   } else {
     // No suggestions provided, so send an empty vector as the results.
@@ skipping 29 matching lines @@
     return;
 
   autofill_delegate->FillAutoFillFormData(
       query_id, form, name, label, unique_id);
 }
 
 void RenderViewHost::AutoFillSuggestionsReturned(
     int query_id,
     const std::vector<string16>& names,
     const std::vector<string16>& labels,
+    const std::vector<string16>& icons,
     const std::vector<int>& unique_ids) {
   autofill_query_id_ = query_id;
   autofill_values_.assign(names.begin(), names.end());
   autofill_labels_.assign(labels.begin(), labels.end());
+  autofill_icons_.assign(icons.begin(), icons.end());
   autofill_unique_ids_.assign(unique_ids.begin(), unique_ids.end());
 }
 
 void RenderViewHost::AutocompleteSuggestionsReturned(
     int query_id, const std::vector<string16>& suggestions) {
   // When query IDs match we are responding to an AutoFill and Autocomplete
   // combined query response.
   // Otherwise Autocomplete is canceling, so we only send suggestions (usually
   // an empty list).
   if (autofill_query_id_ != query_id) {
     // Autocomplete is canceling.
     autofill_values_.clear();
     autofill_labels_.clear();
+    autofill_icons_.clear();
     autofill_unique_ids_.clear();
   }
 
   // Combine AutoFill and Autocomplete values into values and labels.
   for (size_t i = 0; i < suggestions.size(); ++i) {
     bool unique = true;
     for (size_t j = 0; j < autofill_values_.size(); ++j) {
       // If the AutoFill label is empty, we need to make sure we don't add a
       // duplicate value.
       if (autofill_labels_[j].empty() &&
           autofill_values_[j] == suggestions[i]) {
         unique = false;
         break;
       }
     }
 
     if (unique) {
       autofill_values_.push_back(suggestions[i]);
       autofill_labels_.push_back(string16());
+      autofill_icons_.push_back(string16());
       autofill_unique_ids_.push_back(0);  // 0 means no profile.
     }
   }
 
   Send(new ViewMsg_AutoFillSuggestionsReturned(routing_id(),
                                                query_id,
                                                autofill_values_,
                                                autofill_labels_,
+                                               autofill_icons_,
                                                autofill_unique_ids_));
 }
 
 void RenderViewHost::AutoFillFormDataFilled(int query_id,
                                             const FormData& form) {
   Send(new ViewMsg_AutoFillFormDataFilled(routing_id(), query_id, form));
 }
 
 void RenderViewHost::WindowMoveOrResizeStarted() {
   Send(new ViewMsg_MoveOrResizeStarted(routing_id()));
@@ skipping 253 matching lines @@
       delegate_->GetContentSettingsDelegate();
   if (content_settings_delegate)
     content_settings_delegate->OnWebDatabaseAccessed(
         url, name, display_name, estimated_size, blocked_by_policy);
 }
 
 void RenderViewHost::OnSetDisplayingPDFContent() {
   delegate_->SetDisplayingPDFContent();
 }