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

chrome/browser/views/autocomplete/autocomplete_popup_contents_view.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/views/autocomplete/autocomplete_popup_contents_view.h"
 
 #include "app/bidi_line_iterator.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "app/theme_provider.h"
@@ skipping 135 matching lines @@
                                       // in logical order.
   };
   typedef std::vector<RunData> Runs;
 
   // Predicate functions for use when sorting the runs.
   static bool SortRunsLogically(const RunData& lhs, const RunData& rhs);
   static bool SortRunsVisually(const RunData& lhs, const RunData& rhs);
 
   ResultViewState GetState() const;
 
-  SkBitmap* GetIcon() const;
+  const SkBitmap* GetIcon() const;
 
   // Draws the specified |text| into the canvas, using highlighting provided by
   // |classifications|. If |force_dim| is true, ACMatchClassification::DIM is
   // added to all of the classifications. Returns the x position to the right
   // of the string.
   int DrawString(gfx::Canvas* canvas,
                  const std::wstring& text,
                  const ACMatchClassifications& classifications,
                  bool force_dim,
                  int x,
@@ skipping 165 matching lines @@
                                               const RunData& rhs) {
   return lhs.visual_order < rhs.visual_order;
 }
 
 ResultViewState AutocompleteResultView::GetState() const {
   if (model_->IsSelectedIndex(model_index_))
     return SELECTED;
   return model_->IsHoveredIndex(model_index_) ? HOVERED : NORMAL;
 }
 
-SkBitmap* AutocompleteResultView::GetIcon() const {
+const SkBitmap* AutocompleteResultView::GetIcon() const {
+  const SkBitmap* bitmap = model_->GetSpecialIcon(model_index_);
+  if (bitmap)
+    return bitmap;
+
   int icon = match_.starred ?
       IDR_OMNIBOX_STAR : AutocompleteMatch::TypeToIcon(match_.type);
   if (model_->IsSelectedIndex(model_index_)) {
     switch (icon) {
       case IDR_OMNIBOX_HTTP:    icon = IDR_OMNIBOX_HTTP_SELECTED; break;
       case IDR_OMNIBOX_HISTORY: icon = IDR_OMNIBOX_HISTORY_SELECTED; break;
       case IDR_OMNIBOX_SEARCH:  icon = IDR_OMNIBOX_SEARCH_SELECTED; break;
       case IDR_OMNIBOX_MORE:    icon = IDR_OMNIBOX_MORE_SELECTED; break;
       case IDR_OMNIBOX_STAR:    icon = IDR_OMNIBOX_STAR_SELECTED; break;
       default:             NOTREACHED(); break;
@@ skipping 380 matching lines @@
 // AutocompletePopupContentsView, AutocompleteResultViewModel implementation:
 
 bool AutocompletePopupContentsView::IsSelectedIndex(size_t index) const {
   return HasMatchAt(index) ? index == model_->selected_line() : false;
 }
 
 bool AutocompletePopupContentsView::IsHoveredIndex(size_t index) const {
   return HasMatchAt(index) ? index == model_->hovered_line() : false;
 }
 
+const SkBitmap* AutocompletePopupContentsView::GetSpecialIcon(
+    size_t index) const {
+  if (!HasMatchAt(index))
+    return NULL;
+  return model_->GetSpecialIconForMatch(GetMatchAtIndex(index));
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // AutocompletePopupContentsView, AnimationDelegate implementation:
 
 void AutocompletePopupContentsView::AnimationProgressed(
     const Animation* animation) {
   // We should only be running the animation when the popup is already visible.
   DCHECK(popup_ != NULL);
   popup_->SetBounds(GetPopupBounds());
 }
 
@@ skipping 211 matching lines @@
   DCHECK(nb_match <= GetChildViewCount());
   for (int i = 0; i < nb_match; ++i) {
     views::View* child = GetChildViewAt(i);
     gfx::Point point_in_child_coords(point);
     View::ConvertPointToView(this, child, &point_in_child_coords);
     if (child->HitTest(point_in_child_coords))
       return i;
   }
   return AutocompletePopupModel::kNoMatch;
 }