Make search icon in omnibox results hidpi

chrome/browser/ui/gtk/omnibox/omnibox_popup_view_gtk.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/ui/gtk/omnibox/omnibox_popup_view_gtk.h"
 
 #include <gtk/gtk.h>
 
 #include <algorithm>
 #include <string>
@@ skipping 318 matching lines @@
   // Stop listening to our signals before we destroy the model. I suspect that
   // we can race window destruction, otherwise.
   signal_registrar_.reset();
 
   // 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 (ImageMap::iterator it = images_.begin(); it != images_.end(); ++it)
-    delete it->second;
 }
 
 bool OmniboxPopupViewGtk::IsOpen() const {
   return opened_;
 }
 
 void OmniboxPopupViewGtk::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?
   GdkWindow* gdk_window = gtk_widget_get_window(GTK_WIDGET(window_));
@@ skipping 124 matching lines @@
 
 void OmniboxPopupViewGtk::AcceptLine(size_t line,
                                      WindowOpenDisposition disposition) {
   // OpenMatch() may close the popup, which will clear the result set and, by
   // extension, |match| and its contents.  So copy the relevant match out to
   // make sure it stays alive until the call completes.
   AutocompleteMatch match = model_->result().match_at(line);
   omnibox_view_->OpenMatch(match, disposition, GURL(), line);
 }
 
-const gfx::Image* OmniboxPopupViewGtk::IconForMatch(
+gfx::Image OmniboxPopupViewGtk::IconForMatch(
     const AutocompleteMatch& match,
     bool selected,
     bool is_selected_keyword) {
-  const SkBitmap* bitmap = model_->GetIconIfExtensionMatch(match);
-  if (bitmap) {
-    if (!ContainsKey(images_, bitmap)) {
-      // gfx::Image wants ownership of bitmaps given to it, and we might as
-      // well make the bitmap copy a format that will be used.
-      images_[bitmap] = new gfx::Image(gfx::GdkPixbufFromSkBitmap(*bitmap));
-    }
-    return images_[bitmap];
-  }
+  const gfx::Image image = model_->GetIconIfExtensionMatch(match);
+  if (!image.IsEmpty())
+    return image;
 
   int icon;
   if (is_selected_keyword)
     icon = IDR_OMNIBOX_TTS;
   else if (match.starred)
     icon = IDR_OMNIBOX_STAR;
   else
     icon = AutocompleteMatch::TypeToIcon(match.type);
 
   if (selected) {
@@ skipping 12 matching lines @@
         break;
       case IDR_OMNIBOX_TTS:
         icon = IDR_OMNIBOX_TTS_DARK;
         break;
       default:
         NOTREACHED();
         break;
     }
   }
 
-  return theme_service_->GetImageNamed(icon);
+  return *theme_service_->GetImageNamed(icon);
 }
 
 void OmniboxPopupViewGtk::GetVisibleMatchForInput(
     size_t index,
     const AutocompleteMatch** match,
     bool* is_selected_keyword) {
   const AutocompleteResult& result = model_->result();
 
   if (result.match_at(index).associated_keyword.get() &&
       model_->selected_line() == index &&
@@ skipping 178 matching lines @@
       cairo_restore(cr);
     }
 
     if (match->associated_keyword.get()) {
       // If this entry has an associated keyword, draw the arrow at the extreme
       // other side of the omnibox.
       icon_start_x = ltr ? (line_rect.width() - kIconLeftPadding - kIconWidth) :
           kIconLeftPadding;
       // Draw the icon for this result.
       gtk_util::DrawFullImage(cr, widget,
-                              theme_service_->GetImageNamed(
+                              *theme_service_->GetImageNamed(
                                   is_selected ? IDR_OMNIBOX_TTS_DARK :
                                   IDR_OMNIBOX_TTS),
                               icon_start_x, line_rect.y() + kIconTopPadding);
     }
   }
 
   cairo_destroy(cr);
   return TRUE;
 }