ChromeCanvas->gfx::Canvas

chrome/browser/views/tab_icon_view.cc

 // Copyright (c) 2006-2008 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/tab_icon_view.h"
 
 #include <windows.h>
 #include <shellapi.h>
 
-#include "app/gfx/chrome_canvas.h"
+#include "app/gfx/canvas.h"
 #include "app/gfx/favicon_size.h"
 #include "app/gfx/icon_util.h"
 #include "app/resource_bundle.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "grit/theme_resources.h"
 
 static bool g_initialized = false;
@@ skipping 55 matching lines @@
     }
   } else if (model_->ShouldTabIconViewAnimate()) {
     // We didn't think we were loading, but the tab is loading. Reset the
     // frame and status and schedule a paint.
     throbber_running_ = true;
     throbber_frame_ = 0;
     SchedulePaint();
   }
 }
 
-void TabIconView::PaintThrobber(ChromeCanvas* canvas) {
+void TabIconView::PaintThrobber(gfx::Canvas* canvas) {
   int image_size = g_throbber_frames->height();
   PaintIcon(canvas, is_light_ ? *g_throbber_frames_light : *g_throbber_frames,
             throbber_frame_ * image_size, 0, image_size, image_size, false);
 }
 
-void TabIconView::PaintFavIcon(ChromeCanvas* canvas, const SkBitmap& bitmap) {
+void TabIconView::PaintFavIcon(gfx::Canvas* canvas, const SkBitmap& bitmap) {
   PaintIcon(canvas, bitmap, 0, 0, bitmap.width(), bitmap.height(), true);
 }
 
-void TabIconView::PaintIcon(ChromeCanvas* canvas,
+void TabIconView::PaintIcon(gfx::Canvas* canvas,
                             const SkBitmap& bitmap,
                             int src_x,
                             int src_y,
                             int src_w,
                             int src_h,
                             bool filter) {
   // For source images smaller than the favicon square, scale them as if they
   // were padded to fit the favicon square, so we don't blow up tiny favicons
   // into larger or nonproportional results.
   float float_src_w = static_cast<float>(src_w);
@@ skipping 11 matching lines @@
                          static_cast<float>(height()) / scalable_h);
   int dest_w = static_cast<int>(float_src_w * scale);
   int dest_h = static_cast<int>(float_src_h * scale);
 
   // Center the scaled image.
   canvas->DrawBitmapInt(bitmap, src_x, src_y, src_w, src_h,
                         (width() - dest_w) / 2, (height() - dest_h) / 2, dest_w,
                         dest_h, filter);
 }
 
-void TabIconView::Paint(ChromeCanvas* canvas) {
+void TabIconView::Paint(gfx::Canvas* canvas) {
   bool rendered = false;
 
   if (throbber_running_) {
     rendered = true;
     PaintThrobber(canvas);
   } else {
     SkBitmap favicon = model_->GetFavIconForTabIconView();
     if (!favicon.isNull()) {
       rendered = true;
       PaintFavIcon(canvas, favicon);
     }
   }
 
   if (!rendered)
     PaintFavIcon(canvas, *g_default_fav_icon);
 }
 
 gfx::Size TabIconView::GetPreferredSize() {
   return gfx::Size(kFavIconSize, kFavIconSize);
 }