Canvas refactoring part 3....

views/drag_utils.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 "views/drag_utils.h"
 
 #include "app/l10n_util.h"
 #include "app/os_exchange_data.h"
 #include "app/resource_bundle.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
-#include "gfx/canvas.h"
 #include "gfx/canvas_skia.h"
 #include "gfx/font.h"
 #include "googleurl/src/gurl.h"
 #include "grit/app_resources.h"
 #include "views/controls/button/text_button.h"
 
 namespace drag_utils {
 
 // Maximum width of the link drag image in pixels.
 static const int kLinkDragImageMaxWidth = 200;
@@ skipping 18 matching lines @@
   if (icon.isNull()) {
     button.SetIcon(*ResourceBundle::GetSharedInstance().GetBitmapNamed(
                    IDR_DEFAULT_FAVICON));
   } else {
     button.SetIcon(icon);
   }
   gfx::Size prefsize = button.GetPreferredSize();
   button.SetBounds(0, 0, prefsize.width(), prefsize.height());
 
   // Render the image.
-  // TODO(beng): Convert to CanvasSkia
-  gfx::Canvas canvas(prefsize.width(), prefsize.height(), false);
+  gfx::CanvasSkia canvas(prefsize.width(), prefsize.height(), false);
   button.Paint(&canvas, true);
   SetDragImageOnDataObject(canvas, prefsize,
       gfx::Point(prefsize.width() / 2, prefsize.height() / 2), data);
 }
 
 void CreateDragImageForFile(const FilePath::StringType& file_name,
                             SkBitmap* icon,
                             OSExchangeData* data_object) {
   DCHECK(icon);
   DCHECK(data_object);
 
   // Set up our text portion
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   gfx::Font font = rb.GetFont(ResourceBundle::BaseFont);
 
   const int width = kFileDragImageMaxWidth;
   // Add +2 here to allow room for the halo.
   const int height = font.height() + icon->height() +
                      kLinkDragImageVPadding + 2;
-  // TODO(beng): Convert to CanvasSkia
-  gfx::Canvas canvas(width, height, false /* translucent */);
+  gfx::CanvasSkia canvas(width, height, false /* translucent */);
 
   // Paint the icon.
   canvas.DrawBitmapInt(*icon, (width - icon->width()) / 2, 0);
 
 #if defined(OS_WIN)
   // Paint the file name. We inset it one pixel to allow room for the halo.
   std::wstring name = file_util::GetFilenameFromPath(file_name);
   canvas.DrawStringWithHalo(name, font, kFileDragImageTextColor, SK_ColorWHITE,
                             1, icon->height() + kLinkDragImageVPadding + 1,
                             width - 2, font.height(),
                             gfx::Canvas::TEXT_ALIGN_CENTER);
 #else
   std::wstring name = file_util::GetFilenameFromPath(UTF8ToWide(file_name));
   canvas.DrawStringInt(name, font, kFileDragImageTextColor,
                        0, icon->height() + kLinkDragImageVPadding,
                        width, font.height(), gfx::Canvas::TEXT_ALIGN_CENTER);
 #endif
 
   SetDragImageOnDataObject(canvas, gfx::Size(width, height),
                            gfx::Point(width / 2, kLinkDragImageVPadding),
                            data_object);
 }
 
 } // namespace drag_utils