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

chrome/browser/cocoa/location_bar/location_bar_view_mac.mm

 // 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.
 
 #import "chrome/browser/cocoa/location_bar/location_bar_view_mac.h"
 
 #include "app/l10n_util_mac.h"
 #include "app/resource_bundle.h"
 #include "base/i18n/rtl.h"
 #include "base/nsimage_cache_mac.h"
@@ skipping 375 matching lines @@
   if (!tab_button_image_) {
     SkBitmap* skiaBitmap = ResourceBundle::GetSharedInstance().
         GetBitmapNamed(IDR_LOCATION_BAR_KEYWORD_HINT_TAB);
     if (skiaBitmap) {
       tab_button_image_.reset([gfx::SkBitmapToNSImage(*skiaBitmap) retain]);
     }
   }
   return tab_button_image_;
 }
 
+NSImage* LocationBarViewMac::GetKeywordImage(const std::wstring& keyword) {
+  const TemplateURL* template_url =
+      profile_->GetTemplateURLModel()->GetTemplateURLForKeyword(keyword);
+  if (template_url && template_url->IsExtensionKeyword()) {
+    const SkBitmap& bitmap = profile_->GetExtensionsService()->
+        GetOmniboxIcon(template_url->GetExtensionId());
+    return gfx::SkBitmapToNSImage(bitmap);
+  }
+
+  return AutocompleteEditViewMac::ImageForResource(IDR_OMNIBOX_SEARCH);
+}
+
 void LocationBarViewMac::Observe(NotificationType type,
                                  const NotificationSource& source,
                                  const NotificationDetails& details) {
   switch (type.value) {
     case NotificationType::EXTENSION_PAGE_ACTION_VISIBILITY_CHANGED: {
       TabContents* contents = GetTabContents();
       if (Details<TabContents>(contents) != details)
         return;
 
       [field_ updateCursorAndToolTipRects];
@@ skipping 467 matching lines @@
     short_name = profile_->GetTemplateURLModel()->
         GetKeywordShortName(keyword, &is_extension_keyword);
   }
 
   const bool is_keyword_hint = edit_view_->model()->is_keyword_hint();
 
   if (!keyword.empty() && !is_keyword_hint) {
     // Switch from location icon to keyword mode.
     location_icon_decoration_->SetVisible(false);
     selected_keyword_decoration_->SetVisible(true);
-
     selected_keyword_decoration_->SetKeyword(short_name, is_extension_keyword);
+    selected_keyword_decoration_->SetImage(GetKeywordImage(keyword));
 
     // TODO(shess): This goes away once the hints are decorations.
     [cell clearHint];
   } else if (toolbar_model_->GetSecurityLevel() == ToolbarModel::EV_SECURE) {
     // Switch from location icon to show the EV bubble instead.
     location_icon_decoration_->SetVisible(false);
     ev_bubble_decoration_->SetVisible(true);
 
     std::wstring label(toolbar_model_->GetEVCertName());
     ev_bubble_decoration_->SetLabel(base::SysWideToNSString(label));
@@ skipping 33 matching lines @@
 
   // These need to change anytime the layout changes.
   // TODO(shess): Anytime the field editor might have changed, the
   // cursor rects almost certainly should have changed.  The tooltips
   // might change even when the rects don't change.
   [field_ resetFieldEditorFrameIfNeeded];
   [field_ updateCursorAndToolTipRects];
 
   [field_ setNeedsDisplay:YES];
 }