Add Icon Support for New Autofill Gtk UI

chrome/browser/autofill/autofill_popup_view.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/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;
 
 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(
     content::WebContents* web_contents,
     AutofillExternalDelegate* external_delegate)
     : external_delegate_(external_delegate),
       selected_line_(kNoSelection) {
   if (!web_contents)
     return;
 
@@ skipping 17 matching lines @@
 
 void AutofillPopupView::Show(const std::vector<string16>& autofill_values,
                              const std::vector<string16>& autofill_labels,
                              const std::vector<string16>& autofill_icons,
                              const std::vector<int>& autofill_unique_ids) {
   autofill_values_ = autofill_values;
   autofill_labels_ = autofill_labels;
   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] != string16())

[Ilya Sherman, 2012/05/11 22:12:17]

nit: if (!autofill_icons()[i].empty())

[csharp, 2012/05/14 14:19:03]

Done.

+      has_icons_ = true;

[Ilya Sherman, 2012/05/11 22:12:17]

nit: You can add a break; stmt here as well

[csharp, 2012/05/14 14:19:03]

Done.

+  }
+
+
   ShowInternal();
 }
 
 void AutofillPopupView::SetSelectedLine(int selected_line) {
   if (selected_line_ == selected_line)
     return;
 
   if (selected_line_ != kNoSelection)
     InvalidateRow(selected_line_);
 
@@ skipping 74 matching lines @@
   return true;
 }
 
 bool AutofillPopupView::IsSeparatorIndex(int index) {
   // TODO(csharp): Use WebAutofillClient::MenuItemIDSeparator instead.
   // http://crbug.com/125001
   return (index > 0 && autofill_unique_ids_[index - 1] >= 0 &&
           autofill_unique_ids_[index] < 0);
 }
 
+int AutofillPopupView::GetIconResourceID(const string16& resource_name) {
+  std::string name = UTF16ToUTF8(resource_name);

[csharp, 2012/05/11 19:26:37]

I'm not sure how to best do the comparison between the string16 here and the
const char* I define in the file. If I try to define the const chars as
string16s, I get a compile error, "declaration requires an exit-time
destructor".

Any thoughts on how to better do this?

[Ilya Sherman, 2012/05/11 22:12:17]

You can use a char16 pointer for the string constants, or you can use
ASCIIToString16() to up-convert the constants to UTF16 (theoretically, it's
faster to convert ASCII up than to convert across UTF's... though for this code
the performance difference probably doesn't actually matter).

[csharp, 2012/05/14 14:19:03]

K, I'll just use ASCIIToUTF16 to up the constants

+
+  for (size_t i = 0; i < arraysize(kDataResources); ++i) {
+    if (!strcmp(name.c_str(), kDataResources[i].name))

[Ilya Sherman, 2012/05/11 22:12:17]

nit: Please use std::string's or string16's operator== rather than strcmp here.

[csharp, 2012/05/14 14:19:03]

Done.

+      return kDataResources[i].id;
+  }
+
+  return -1;
+}
+
 bool AutofillPopupView::CanDelete(int id) {
   return id > 0 ||
       id == WebAutofillClient::MenuItemIDAutocompleteEntry ||
       id == WebAutofillClient::MenuItemIDPasswordEntry;
 }
 
 bool AutofillPopupView::HasAutofillEntries() {
   return autofill_values_.size() != 0 &&
       (autofill_unique_ids_[0] > 0 ||
        autofill_unique_ids_[0] ==
          WebAutofillClient::MenuItemIDAutocompleteEntry ||
        autofill_unique_ids_[0] == WebAutofillClient::MenuItemIDPasswordEntry ||
        autofill_unique_ids_[0] == WebAutofillClient::MenuItemIDDataListEntry);
 }
 
 void AutofillPopupView::Observe(int type,
                                 const content::NotificationSource& source,
                                 const content::NotificationDetails& details) {
   if (type == content::NOTIFICATION_WEB_CONTENTS_HIDDEN
       || type == content::NOTIFICATION_NAV_ENTRY_COMMITTED)
     Hide();
 }