ChromeCanvas->gfx::Canvas

views/drag_utils.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 "views/drag_utils.h"
 
 #include <objidl.h>
 #include <shlobj.h>
 #include <shobjidl.h>
 
-#include "app/gfx/chrome_canvas.h"
-#include "app/gfx/chrome_font.h"
+#include "app/gfx/canvas.h"
+#include "app/gfx/font.h"
 #include "app/l10n_util.h"
 #include "app/os_exchange_data.h"
 #include "app/resource_bundle.h"
 #include "base/file_util.h"
 #include "base/gfx/gdi_util.h"
 #include "base/gfx/point.h"
 #include "base/string_util.h"
 #include "googleurl/src/gurl.h"
 #include "grit/theme_resources.h"
 #include "views/controls/button/text_button.h"
@@ skipping 29 matching lines @@
     sdi.crColorKey = 0xFFFFFFFF;
     sdi.hbmpDragImage = hbitmap;
     sdi.ptOffset.x = cursor_offset_x;
     sdi.ptOffset.y = cursor_offset_y;
     helper->InitializeFromBitmap(&sdi, data_object);
   }
 };
 
 // Blit the contents of the canvas to a new HBITMAP. It is the caller's
 // responsibility to release the |bits| buffer.
-static HBITMAP CreateBitmapFromCanvas(const ChromeCanvas& canvas,
+static HBITMAP CreateBitmapFromCanvas(const gfx::Canvas& canvas,
                                       int width,
                                       int height) {
   HDC screen_dc = GetDC(NULL);
   BITMAPINFOHEADER header;
   gfx::CreateBitmapHeader(width, height, &header);
   void* bits;
   HBITMAP bitmap =
       CreateDIBSection(screen_dc, reinterpret_cast<BITMAPINFO*>(&header),
                        DIB_RGB_COLORS, &bits, NULL, 0);
   HDC compatible_dc = CreateCompatibleDC(screen_dc);
@@ skipping 22 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.
-  ChromeCanvas canvas(prefsize.width(), prefsize.height(), false);
+  gfx::Canvas canvas(prefsize.width(), prefsize.height(), false);
   button.Paint(&canvas, true);
   SetDragImageOnDataObject(canvas, prefsize.width(), prefsize.height(),
                            prefsize.width() / 2, prefsize.height() / 2,
                            data);
 }
 
 void CreateDragImageForFile(const std::wstring& file_name,
                             SkBitmap* icon,
                             IDataObject* data_object) {
   DCHECK(icon);
   DCHECK(data_object);
 
   // Set up our text portion
   const std::wstring& name = file_util::GetFilenameFromPath(file_name);
   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;
-  ChromeCanvas canvas(width, height, false /* translucent */);
+  gfx::Canvas canvas(width, height, false /* translucent */);
 
   // Paint the icon.
   canvas.DrawBitmapInt(*icon, (width - icon->width()) / 2, 0);
 
   // Paint the file name. We inset it one pixel to allow room for the halo.
   canvas.DrawStringWithHalo(name, font, kFileDragImageTextColor, SK_ColorWHITE,
                             1, icon->height() + kLinkDragImageVPadding + 1,
                             width - 2, font.height(),
-                            ChromeCanvas::TEXT_ALIGN_CENTER);
+                            gfx::Canvas::TEXT_ALIGN_CENTER);
 
   SetDragImageOnDataObject(canvas, width, height, width / 2,
                            kLinkDragImageVPadding, data_object);
 }
 
-void SetDragImageOnDataObject(const ChromeCanvas& canvas,
+void SetDragImageOnDataObject(const gfx::Canvas& canvas,
                               int width,
                               int height,
                               int cursor_x_offset,
                               int cursor_y_offset,
                               IDataObject* data_object) {
   DCHECK(data_object && width > 0 && height > 0);
   // SetDragImageOnDataObject(HBITMAP) takes ownership of the bitmap.
   HBITMAP bitmap = CreateBitmapFromCanvas(canvas, width, height);
 
   // Attach 'bitmap' to the data_object.
   SetDragImageOnDataObject(bitmap, width, height,
                            cursor_x_offset,
                            cursor_y_offset,
                            data_object);
 }
 
 } // namespace drag_utils