Make search icon in omnibox results hidpi

chrome/browser/ui/views/omnibox/omnibox_result_view.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.
 
 // For WinDDK ATL compatibility, these ATL headers must come first.
 #include "build/build_config.h"
 #if defined(OS_WIN)
 #include <atlbase.h>  // NOLINT
 #include <atlwin.h>  // NOLINT
 #endif
@@ skipping 259 matching lines @@
 
 // static
 bool OmniboxResultView::SortRunsVisually(const RunData& lhs,
                                          const RunData& rhs) {
   return lhs.visual_order < rhs.visual_order;
 }
 
 // static
 int OmniboxResultView::default_icon_size_ = 0;
 
-const SkBitmap* OmniboxResultView::GetIcon() const {
-  const SkBitmap* bitmap = model_->GetIconIfExtensionMatch(model_index_);
-  if (bitmap)
-    return bitmap;
+gfx::ImageSkia OmniboxResultView::GetIcon() const {
+  const gfx::Image image = model_->GetIconIfExtensionMatch(model_index_);
+  if (!image.IsEmpty())
+    return image.AsImageSkia();
 
   int icon = match_.starred ?
       IDR_OMNIBOX_STAR : AutocompleteMatch::TypeToIcon(match_.type);
   if (GetState() == SELECTED) {
     switch (icon) {
       case IDR_OMNIBOX_EXTENSION_APP:
         icon = IDR_OMNIBOX_EXTENSION_APP_SELECTED;
         break;
       case IDR_OMNIBOX_HTTP:
         icon = IDR_OMNIBOX_HTTP_SELECTED;
         break;
       case IDR_OMNIBOX_SEARCH:
         icon = IDR_OMNIBOX_SEARCH_SELECTED;
         break;
       case IDR_OMNIBOX_STAR:
         icon = IDR_OMNIBOX_STAR_SELECTED;
         break;
       default:
         NOTREACHED();
         break;
     }
   }
-  return ui::ResourceBundle::GetSharedInstance().GetBitmapNamed(icon);
+  return *ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(icon);
 }
 
 const gfx::ImageSkia* OmniboxResultView::GetKeywordIcon() const {
   // NOTE: If we ever begin returning icons of varying size, then callers need
   // to ensure that |keyword_icon_| is resized each time its image is reset.
   return ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
       (GetState() == SELECTED) ? IDR_OMNIBOX_TTS_SELECTED : IDR_OMNIBOX_TTS);
 }
 
 int OmniboxResultView::DrawString(
@@ skipping 237 matching lines @@
       //   * It is also bold, in which case we don't want to fall back
       //     to a normal ellipsis anyway (see comment above).
     }
   }
 
   // We couldn't draw anything.
   runs->clear();
 }
 
 void OmniboxResultView::Layout() {
-  const SkBitmap* icon = GetIcon();
+  const gfx::ImageSkia icon = GetIcon();
 
   icon_bounds_.SetRect(edge_item_padding_ +
-      ((icon->width() == default_icon_size_) ?
+      ((icon.width() == default_icon_size_) ?
           0 : LocationBarView::kIconInternalPadding),
-      (height() - icon->height()) / 2, icon->width(), icon->height());
+      (height() - icon.height()) / 2, icon.width(), icon.height());
 
   int text_x = edge_item_padding_ + default_icon_size_ + item_padding_;
   int text_height = GetTextHeight();
   int text_width;
 
   if (match_.associated_keyword.get()) {
     const int kw_collapsed_size =
         keyword_icon_->width() + edge_item_padding_;
     const int max_kw_x = width() - kw_collapsed_size;
     const int kw_x =
@@ skipping 18 matching lines @@
 }
 
 void OmniboxResultView::OnPaint(gfx::Canvas* canvas) {
   const ResultViewState state = GetState();
   if (state != NORMAL)
     canvas->DrawColor(GetColor(state, BACKGROUND));
 
   if (!match_.associated_keyword.get() ||
       keyword_icon_->x() > icon_bounds_.right()) {
     // Paint the icon.
-    canvas->DrawImageInt(*GetIcon(), GetMirroredXForRect(icon_bounds_),
+    canvas->DrawImageInt(GetIcon(), GetMirroredXForRect(icon_bounds_),
                          icon_bounds_.y());
 
     // Paint the text.
     int x = GetMirroredXForRect(text_bounds_);
     mirroring_context_->Initialize(x, text_bounds_.width());
     PaintMatch(canvas, match_, x);
   }
 
   if (match_.associated_keyword.get()) {
     // Paint the keyword text.
     int x = GetMirroredXForRect(keyword_text_bounds_);
     mirroring_context_->Initialize(x, keyword_text_bounds_.width());
     PaintMatch(canvas, *match_.associated_keyword.get(), x);
   }
 }
 
 void OmniboxResultView::AnimationProgressed(const ui::Animation* animation) {
   Layout();
   SchedulePaint();
 }