Enables HiDPI favicon to be displayed in tab strip on CrOS

chrome/browser/ui/views/tab_icon_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.
 
 #include "chrome/browser/ui/views/tab_icon_view.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shellapi.h>
 #endif
@@ skipping 81 matching lines @@
 }
 
 void TabIconView::PaintThrobber(gfx::Canvas* canvas) {
   gfx::ImageSkia throbber(*GetThemeProvider()->GetImageSkiaNamed(
       is_light_ ? IDR_THROBBER_LIGHT : IDR_THROBBER));
   int image_size = throbber.height();
   PaintIcon(canvas, throbber, throbber_frame_ * image_size, 0, image_size,
             image_size, false);
 }
 
-void TabIconView::PaintFavicon(gfx::Canvas* canvas, const SkBitmap& image) {
+void TabIconView::PaintFavicon(gfx::Canvas* canvas,
+                               const gfx::ImageSkia& image) {
   PaintIcon(canvas, image, 0, 0, image.width(), image.height(), true);
 }
 
 void TabIconView::PaintIcon(gfx::Canvas* canvas,
                             const gfx::ImageSkia& image,
                             int src_x,
                             int src_y,
                             int src_w,
                             int src_h,
                             bool filter) {
@@ skipping 22 matching lines @@
                        dest_h, filter);
 }
 
 void TabIconView::OnPaint(gfx::Canvas* canvas) {
   bool rendered = false;
 
   if (throbber_running_) {
     rendered = true;
     PaintThrobber(canvas);
   } else {
-    SkBitmap favicon = model_->GetFaviconForTabIconView();
+    gfx::ImageSkia favicon = model_->GetFaviconForTabIconView();
     if (!favicon.isNull()) {
       rendered = true;
       PaintFavicon(canvas, favicon);
     }
   }
 
   if (!rendered)
     PaintFavicon(canvas, *g_default_favicon);
 }
 
 gfx::Size TabIconView::GetPreferredSize() {
   return gfx::Size(gfx::kFaviconSize, gfx::kFaviconSize);
 }