Canvas refactoring part 2....

views/controls/menu/native_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/native_menu_win.h"
 
 #include "app/l10n_util.h"
 #include "app/l10n_util_win.h"
 #include "base/keyboard_codes.h"
 #include "base/logging.h"
 #include "base/stl_util-inl.h"
-#include "gfx/canvas.h"
+#include "gfx/canvas_skia.h"
 #include "gfx/font.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "views/accelerator.h"
 #include "views/controls/menu/menu_2.h"
 
 namespace views {
 
 // The width of an icon, including the pixels between the icon and
 // the item label.
 static const int kIconWidth = 23;
@@ skipping 193 matching lines @@
       if (!accel.empty())
         DrawTextEx(dc, const_cast<wchar_t*>(accel.data()),
                    static_cast<int>(accel.size()), &rect,
                    format | DT_RIGHT, NULL);
       SelectObject(dc, old_font);
 
       // Draw the icon after the label, otherwise it would be covered
       // by the label.
       SkBitmap icon;
       if (data->native_menu_win->model_->GetIconAt(data->model_index, &icon)) {
-        gfx::Canvas canvas(icon.width(), icon.height(), false);
+        gfx::CanvasSkia canvas(icon.width(), icon.height(), false);
         canvas.drawColor(SK_ColorBLACK, SkXfermode::kClear_Mode);
         canvas.DrawBitmapInt(icon, 0, 0);
         canvas.getTopPlatformDevice().drawToHDC(dc,
             draw_item_struct->rcItem.left + kItemLeftMargin,
             draw_item_struct->rcItem.top + (draw_item_struct->rcItem.bottom -
                 draw_item_struct->rcItem.top - icon.height()) / 2, NULL);
       }
 
     } else {
       // Draw the separator
@@ skipping 391 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // MenuWrapper, public:
 
 // static
 MenuWrapper* MenuWrapper::CreateWrapper(Menu2* menu) {
   return new NativeMenuWin(menu->model(), NULL);
 }
 
 }  // namespace views