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

chrome/browser/gtk/location_bar_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/gtk/location_bar_view_gtk.h"
 
 #include <string>
 
 #include "app/gtk_dnd_util.h"
 #include "app/l10n_util.h"
@@ skipping 190 matching lines @@
   // Tab to search (the keyword box on the left hand side).
   tab_to_search_full_label_ = gtk_label_new(NULL);
   tab_to_search_partial_label_ = gtk_label_new(NULL);
   GtkWidget* tab_to_search_label_hbox = gtk_hbox_new(FALSE, 0);
   gtk_box_pack_start(GTK_BOX(tab_to_search_label_hbox),
                      tab_to_search_full_label_, FALSE, FALSE, 0);
   gtk_box_pack_start(GTK_BOX(tab_to_search_label_hbox),
                      tab_to_search_partial_label_, FALSE, FALSE, 0);
   GtkWidget* tab_to_search_hbox = gtk_hbox_new(FALSE, 0);
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-  GtkWidget* tab_to_search_lens = gtk_image_new_from_pixbuf(
+  tab_to_search_magnifier_ = gtk_image_new_from_pixbuf(
       rb.GetPixbufNamed(IDR_OMNIBOX_SEARCH));
-  gtk_box_pack_start(GTK_BOX(tab_to_search_hbox), tab_to_search_lens,
+  gtk_box_pack_start(GTK_BOX(tab_to_search_hbox), tab_to_search_magnifier_,
                      FALSE, FALSE, 0);
   gtk_util::CenterWidgetInHBox(tab_to_search_hbox, tab_to_search_label_hbox,
                                false, 0);
 
   // This creates a box around the keyword text with a border, background color,
   // and padding around the text.
   tab_to_search_box_ = gtk_util::CreateGtkBorderBin(
       tab_to_search_hbox, NULL, 1, 1, 1, 3);
   gtk_widget_set_name(tab_to_search_box_, "chrome-tab-to-search-box");
   gtk_util::ActAsRoundedWindow(tab_to_search_box_, kKeywordBorderColor,
@@ skipping 644 matching lines @@
       GetKeywordShortName(keyword, &is_extension_keyword);
   int message_id = is_extension_keyword ?
       IDS_OMNIBOX_EXTENSION_KEYWORD_TEXT : IDS_OMNIBOX_KEYWORD_TEXT;
   std::wstring full_name(l10n_util::GetStringF(message_id, short_name));
   std::wstring partial_name(l10n_util::GetStringF(
       message_id, location_bar_util::CalculateMinString(short_name)));
   gtk_label_set_text(GTK_LABEL(tab_to_search_full_label_),
                      WideToUTF8(full_name).c_str());
   gtk_label_set_text(GTK_LABEL(tab_to_search_partial_label_),
                      WideToUTF8(partial_name).c_str());
+
+  if (last_keyword_ != keyword) {
+    last_keyword_ = keyword;
+
+    if (is_extension_keyword) {
+      const TemplateURL* template_url =
+          profile_->GetTemplateURLModel()->GetTemplateURLForKeyword(keyword);
+      const SkBitmap& bitmap = profile_->GetExtensionsService()->
+          GetOmniboxIcon(template_url->GetExtensionId());
+      GdkPixbuf* pixbuf = gfx::GdkPixbufFromSkBitmap(&bitmap);
+      gtk_image_set_from_pixbuf(GTK_IMAGE(tab_to_search_magnifier_), pixbuf);
+      g_object_unref(pixbuf);
+    } else {
+      ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+      gtk_image_set_from_pixbuf(GTK_IMAGE(tab_to_search_magnifier_),
+                                rb.GetPixbufNamed(IDR_OMNIBOX_SEARCH));
+    }
+  }
 }
 
 void LocationBarViewGtk::SetKeywordHintLabel(const std::wstring& keyword) {
   if (keyword.empty())
     return;
 
   DCHECK(profile_);
   if (!profile_->GetTemplateURLModel())
     return;
 
@@ skipping 515 matching lines @@
 
   std::string badge_text = page_action_->GetBadgeText(tab_id);
   if (badge_text.empty())
     return FALSE;
 
   gfx::CanvasSkiaPaint canvas(event, false);
   gfx::Rect bounding_rect(widget->allocation);
   page_action_->PaintBadge(&canvas, bounding_rect, tab_id);
   return FALSE;
 }