Canvas refactoring part 2....

views/controls/menu/menu_win.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/controls/menu/menu_win.h"
 
 #include <string>
 
 #include "app/l10n_util.h"
 #include "app/l10n_util_win.h"
 #include "app/win/window_impl.h"
 #include "base/keyboard_codes.h"
 #include "base/logging.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
-#include "gfx/canvas.h"
+#include "gfx/canvas_skia.h"
 #include "gfx/font.h"
 #include "gfx/rect.h"
 #include "views/accelerator.h"
 
 namespace views {
 
 // The width of an icon, including the pixels between the icon and
 // the item label.
 static const int kIconWidth = 23;
 // Margins between the top of the item and the label.
@@ skipping 150 matching lines @@
                  static_cast<int>(label.size()), &rect, format | DT_LEFT, NULL);
       if (!accel.empty())
         DrawTextEx(hDC, const_cast<wchar_t*>(accel.data()),
                    static_cast<int>(accel.size()), &rect,
                    format | DT_RIGHT, NULL);
       SelectObject(hDC, old_font);
 
       // Draw the icon after the label, otherwise it would be covered
       // by the label.
       if (data->icon.width() != 0 && data->icon.height() != 0) {
-        gfx::Canvas canvas(data->icon.width(), data->icon.height(), false);
+        gfx::CanvasSkia canvas(data->icon.width(), data->icon.height(), false);
         canvas.drawColor(SK_ColorBLACK, SkXfermode::kClear_Mode);
         canvas.DrawBitmapInt(data->icon, 0, 0);
         canvas.getTopPlatformDevice().drawToHDC(hDC, lpdis->rcItem.left +
             kItemLeftMargin, lpdis->rcItem.top + (lpdis->rcItem.bottom -
                 lpdis->rcItem.top - data->icon.height()) / 2, NULL);
       }
 
     } else {
       // Draw the separator
       lpdis->rcItem.top += (lpdis->rcItem.bottom - lpdis->rcItem.top) / 3;
@@ skipping 367 matching lines @@
       break;
 
     default:
       NOTREACHED();
       return 0;
   }
   return align_flags;
 }
 
 }  // namespace views