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

chrome/renderer/autofill_helper.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/renderer/autofill_helper.h"
 
 #include "app/l10n_util.h"
 #include "chrome/renderer/form_manager.h"
 #include "chrome/renderer/render_view.h"
 #include "grit/generated_resources.h"
@@ skipping 48 matching lines @@
   if (suggestions_options_index_ != -1)
     suggestions_options_index_--;
 
   render_view_->Send(new ViewHostMsg_RemoveAutocompleteEntry(
       render_view_->routing_id(), name, value));
 }
 
 void AutoFillHelper::SuggestionsReceived(int query_id,
                                          const std::vector<string16>& values,
                                          const std::vector<string16>& labels,
+                                         const std::vector<string16>& icons,
                                          const std::vector<int>& unique_ids) {
   WebKit::WebView* web_view = render_view_->webview();
   if (!web_view || query_id != autofill_query_id_)
     return;
 
   // Any popup currently showing is now obsolete.
   web_view->hidePopups();
 
   // No suggestions: nothing to do.
   if (values.empty())
     return;
 
   std::vector<string16> v(values);
   std::vector<string16> l(labels);
+  std::vector<string16> i(icons);
   std::vector<int> ids(unique_ids);
   int separator_index = -1;
 
   // The form has been auto-filled, so give the user the chance to clear the
   // form.  Append the 'Clear form' menu item.
   if (form_manager_.FormWithNodeIsAutoFilled(autofill_query_node_)) {
     v.push_back(l10n_util::GetStringUTF16(IDS_AUTOFILL_CLEAR_FORM_MENU_ITEM));
     l.push_back(string16());
+    i.push_back(string16());
     ids.push_back(0);
     suggestions_clear_index_ = v.size() - 1;
     separator_index = values.size();
   }
 
   // Only include "AutoFill Options" special menu item if we have AutoFill
   // items, identified by |unique_ids| having at least one valid value.
   bool show_options = false;
   for (size_t i = 0; i < ids.size(); ++i) {
     if (ids[i] != 0) {
       show_options = true;
       break;
     }
   }
   if (show_options) {
     // Append the 'AutoFill Options...' menu item.
     v.push_back(l10n_util::GetStringUTF16(IDS_AUTOFILL_OPTIONS));
     l.push_back(string16());
+    i.push_back(string16());
     ids.push_back(0);
     suggestions_options_index_ = v.size() - 1;
     separator_index = values.size();
   }
 
   // Send to WebKit for display.
   if (!v.empty()) {
     web_view->applyAutoFillSuggestions(
-        autofill_query_node_, v, l, ids, separator_index);
+        autofill_query_node_, v, l, i, ids, separator_index);
   }
 }
 
 void AutoFillHelper::FormDataFilled(int query_id,
                                     const webkit_glue::FormData& form) {
   if (!render_view_->webview() || query_id != autofill_query_id_)
     return;
 
   switch (autofill_action_) {
     case AUTOFILL_FILL:
@@ skipping 103 matching lines @@
             web_form, FormManager::REQUIRE_NONE, false, &form)) {
       forms.push_back(form);
     }
   }
 
   if (!forms.empty()) {
     render_view_->Send(new ViewHostMsg_FormsSeen(render_view_->routing_id(),
                                                  forms));
   }
 }