Use the extension icon for extension omnibox results instead of the generic

chrome/browser/autocomplete/autocomplete_popup_view_gtk.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/autocomplete/autocomplete_popup_view_gtk.h"
 
 #include <gtk/gtk.h>
 
 #include <algorithm>
 #include <string>
 
 #include "app/resource_bundle.h"
 #include "base/basictypes.h"
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
+#include "base/stl_util-inl.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete.h"
 #include "chrome/browser/autocomplete/autocomplete_edit.h"
 #include "chrome/browser/autocomplete/autocomplete_edit_view_gtk.h"
 #include "chrome/browser/autocomplete/autocomplete_popup_model.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/gtk/gtk_theme_provider.h"
 #include "chrome/browser/gtk/gtk_util.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/search_engines/template_url.h"
@@ skipping 163 matching lines @@
     PangoAttribute* weight_attr = pango_attr_weight_new(weight);
     weight_attr->start_index = offset;
     pango_attr_list_insert(attrs, weight_attr);  // Ownership taken.
   }
 
   pango_layout_set_text(layout, text_utf8.data(), text_utf8.size());
   pango_layout_set_attributes(layout, attrs);  // Ref taken.
   pango_attr_list_unref(attrs);
 }
 
-GdkPixbuf* IconForMatch(BrowserThemeProvider* theme,
-                        const AutocompleteMatch& match,
-                        bool selected) {
-  int icon = match.starred ?
-      IDR_OMNIBOX_STAR : AutocompleteMatch::TypeToIcon(match.type);
-  if (selected) {
-    switch (icon) {
-      case IDR_OMNIBOX_HTTP:    icon = IDR_OMNIBOX_HTTP_DARK; break;
-      case IDR_OMNIBOX_HISTORY: icon = IDR_OMNIBOX_HISTORY_DARK; break;
-      case IDR_OMNIBOX_SEARCH:  icon = IDR_OMNIBOX_SEARCH_DARK; break;
-      case IDR_OMNIBOX_MORE:    icon = IDR_OMNIBOX_MORE_DARK; break;
-      case IDR_OMNIBOX_STAR:    icon = IDR_OMNIBOX_STAR_DARK; break;
-      default:                  NOTREACHED(); break;
-    }
-  }
-
-  // TODO(estade): Do we want to flip these for RTL?  (Windows doesn't).
-  return theme->GetPixbufNamed(icon);
-}
-
 // Generates the normal URL color, a green color used in unhighlighted URL
 // text. It is a mix of |kURLTextColor| and the current text color.  Unlike the
 // selected text color, It is more important to match the qualities of the
 // foreground typeface color instead of taking the background into account.
 GdkColor NormalURLColor(GdkColor foreground) {
   color_utils::HSL fg_hsl;
   color_utils::SkColorToHSL(gfx::GdkColorToSkColor(foreground), &fg_hsl);
 
   color_utils::HSL hue_hsl;
   color_utils::SkColorToHSL(gfx::GdkColorToSkColor(kURLTextColor), &hue_hsl);
@@ skipping 116 matching lines @@
   // on. http://crbug.com/22015.
 }
 
 AutocompletePopupViewGtk::~AutocompletePopupViewGtk() {
   // Explicitly destroy our model here, before we destroy our GTK widgets.
   // This is because the model destructor can call back into us, and we need
   // to make sure everything is still valid when it does.
   model_.reset();
   g_object_unref(layout_);
   gtk_widget_destroy(window_);
+
+  for (PixbufMap::iterator it = pixbufs_.begin(); it != pixbufs_.end(); ++it)
+    g_object_unref(it->second);
 }
 
 void AutocompletePopupViewGtk::InvalidateLine(size_t line) {
   // TODO(deanm): Is it possible to use some constant for the width, instead
   // of having to query the width of the window?
   GdkRectangle line_rect = GetRectForLine(
       line, GetWindowRect(window_->window).width()).ToGdkRectangle();
   gdk_window_invalidate_rect(window_->window, &line_rect, FALSE);
 }
 
@@ skipping 126 matching lines @@
   // OpenURL() may close the popup, which will clear the result set and, by
   // extension, |match| and its contents.  So copy the relevant strings out to
   // make sure they stay alive until the call completes.
   const GURL url(match.destination_url);
   std::wstring keyword;
   const bool is_keyword_hint = model_->GetKeywordForMatch(match, &keyword);
   edit_view_->OpenURL(url, disposition, match.transition, GURL(), line,
                       is_keyword_hint ? std::wstring() : keyword);
 }
 
+GdkPixbuf* AutocompletePopupViewGtk::IconForMatch(
+    const AutocompleteMatch& match, bool selected) {
+  const SkBitmap* bitmap = model_->GetSpecialIconForMatch(match);
+  if (bitmap) {
+    if (!ContainsKey(pixbufs_, bitmap))
+      pixbufs_[bitmap] = gfx::GdkPixbufFromSkBitmap(bitmap);
+    return pixbufs_[bitmap];
+  }
+
+  int icon = match.starred ?
+      IDR_OMNIBOX_STAR : AutocompleteMatch::TypeToIcon(match.type);
+  if (selected) {
+    switch (icon) {
+      case IDR_OMNIBOX_HTTP:    icon = IDR_OMNIBOX_HTTP_DARK; break;
+      case IDR_OMNIBOX_HISTORY: icon = IDR_OMNIBOX_HISTORY_DARK; break;
+      case IDR_OMNIBOX_SEARCH:  icon = IDR_OMNIBOX_SEARCH_DARK; break;
+      case IDR_OMNIBOX_MORE:    icon = IDR_OMNIBOX_MORE_DARK; break;
+      case IDR_OMNIBOX_STAR:    icon = IDR_OMNIBOX_STAR_DARK; break;
+      default:                  NOTREACHED(); break;
+    }
+  }
+
+  // TODO(estade): Do we want to flip these for RTL?  (Windows doesn't).
+  return theme_provider_->GetPixbufNamed(icon);
+}
+
 gboolean AutocompletePopupViewGtk::HandleMotion(GtkWidget* widget,
                                                 GdkEventMotion* event) {
   // TODO(deanm): Windows has a bunch of complicated logic here.
   size_t line = LineFromY(static_cast<int>(event->y));
   // There is both a hovered and selected line, hovered just means your mouse
   // is over it, but selected is what's showing in the location edit.
   model_->SetHoveredLine(line);
   // Select the line if the user has the left mouse button down.
   if (!ignore_mouse_drag_ && (event->state & GDK_BUTTON1_MASK))
     model_->SetSelectedLine(line, false);
@@ skipping 92 matching lines @@
       // This entry is selected or hovered, fill a rect with the color.
       gdk_draw_rectangle(drawable, gc, TRUE,
                          line_rect.x(), line_rect.y(),
                          line_rect.width(), line_rect.height());
     }
 
     int icon_start_x = ltr ? (kIconLeftPadding - gtk_offset) :
         (line_rect.width() - kIconLeftPadding - kIconWidth + gtk_offset);
     // Draw the icon for this result.
     DrawFullPixbuf(drawable, gc,
-                   IconForMatch(theme_provider_, match, is_selected),
+                   IconForMatch(match, is_selected),
                    icon_start_x, line_rect.y() + kIconTopPadding);
 
     // Draw the results text vertically centered in the results space.
     // First draw the contents / url, but don't let it take up the whole width
     // if there is also a description to be shown.
     bool has_description = !match.description.empty();
     int text_width = window_rect.width() - (kIconAreaWidth + kRightPadding);
     int allocated_content_width = has_description ?
         static_cast<int>(text_width * kContentWidthPercentage) : text_width;
     pango_layout_set_width(layout_, allocated_content_width * PANGO_SCALE);
@@ skipping 38 matching lines @@
                           (text_width - actual_content_width + gtk_offset -
                            (actual_description_width / PANGO_SCALE)),
                       content_y, layout_);
     }
   }
 
   g_object_unref(gc);
 
   return TRUE;
 }