Add Icon Support for New Autofill Gtk UI

chrome/browser/autofill/autofill_popup_view.cc

Index: chrome/browser/autofill/autofill_popup_view.cc
diff --git a/chrome/browser/autofill/autofill_popup_view.cc b/chrome/browser/autofill/autofill_popup_view.cc
index 7f3d5ea14015e9082f07e6f6e109aad6107add43..d354a1401e90867b8f0924bfe1a6ea27c60130c0 100644
--- a/chrome/browser/autofill/autofill_popup_view.cc
+++ b/chrome/browser/autofill/autofill_popup_view.cc
@@ -5,12 +5,14 @@
 #include "chrome/browser/autofill/autofill_popup_view.h"
 
 #include "base/logging.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/browser/autofill/autofill_external_delegate.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
+#include "grit/webkit_resources.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebAutofillClient.h"
 
 using WebKit::WebAutofillClient;
@@ -20,6 +22,22 @@ namespace {
 // Used to indicate that no line is currently selected by the user.
 const int kNoSelection = -1;
 
+struct DataResource {
+  const char* name;
+  int id;
+};
+
+const DataResource kDataResources[] = {
+  { "americanExpressCC", IDR_AUTOFILL_CC_AMEX },
+  { "dinersCC", IDR_AUTOFILL_CC_DINERS },
+  { "discoverCC", IDR_AUTOFILL_CC_DISCOVER },
+  { "genericCC", IDR_AUTOFILL_CC_GENERIC },
+  { "jcbCC", IDR_AUTOFILL_CC_JCB },
+  { "masterCardCC", IDR_AUTOFILL_CC_MASTERCARD },
+  { "soloCC", IDR_AUTOFILL_CC_SOLO },
+  { "visaCC", IDR_AUTOFILL_CC_VISA },
+};
+
 }  // end namespace
 
 AutofillPopupView::AutofillPopupView(
@@ -57,6 +75,15 @@ void AutofillPopupView::Show(const std::vector<string16>& autofill_values,
   autofill_icons_ = autofill_icons;
   autofill_unique_ids_ = autofill_unique_ids;
 
+  has_icons_ = false;
+  for (size_t i = 0; i < autofill_icons_.size(); ++i) {
+    if (!autofill_icons_[i].empty()) {
+      has_icons_ = true;
+      break;
+    }
+  }
+
+
   ShowInternal();
 }
 
@@ -151,6 +178,15 @@ bool AutofillPopupView::IsSeparatorIndex(int index) {
           autofill_unique_ids_[index] < 0);
 }
 
+int AutofillPopupView::GetIconResourceID(const string16& resource_name) {
+  for (size_t i = 0; i < arraysize(kDataResources); ++i) {
+    if (resource_name == ASCIIToUTF16(kDataResources[i].name))
+      return kDataResources[i].id;
+  }
+
+  return -1;
+}
+
 bool AutofillPopupView::CanDelete(int id) {
   return id > 0 ||
       id == WebAutofillClient::MenuItemIDAutocompleteEntry ||