skia::PlatformCanvas is being deprecated. Going forward we will use gfx::Canvas wherever we need ...

views/controls/menu/native_menu_win.cc

Index: views/controls/menu/native_menu_win.cc
===================================================================
--- views/controls/menu/native_menu_win.cc	(revision 82144)
+++ views/controls/menu/native_menu_win.cc	(working copy)
@@ -18,6 +18,7 @@
 #include "ui/base/win/hwnd_util.h"
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/font.h"
+#include "ui/gfx/rect.h"
 #include "views/accelerator.h"
 #include "views/controls/menu/menu_2.h"
 
@@ -237,15 +238,19 @@
       // by the label.
       SkBitmap icon;
       if (data->native_menu_win->model_->GetIconAt(data->model_index, &icon)) {
-        gfx::CanvasSkia canvas(icon.width(), icon.height(), false);
-        canvas.drawColor(SK_ColorBLACK, SkXfermode::kClear_Mode);
+        gfx::CanvasSkia canvas;
+        canvas.Init(icon.width(), icon.height(), false);
+
+        canvas.skia_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);
+        canvas.BlitToNativeContext(
+            gfx::Rect(icon.width(), icon.height()),
+            gfx::Point(draw_item_struct->rcItem.left + kItemLeftMargin,
+                       draw_item_struct->rcItem.top +
+                           (draw_item_struct->rcItem.bottom -
+                            draw_item_struct->rcItem.top - icon.height()) / 2),
+            dc);
       }
-
     } else {
       // Draw the separator
       draw_item_struct->rcItem.top +=