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

views/controls/menu/menu_win.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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 "base/logging.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
@@ skipping 166 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::CanvasSkia canvas(data->icon.width(), data->icon.height(), false);
-        canvas.drawColor(SK_ColorBLACK, SkXfermode::kClear_Mode);
+        gfx::CanvasSkia canvas;
+        canvas.Init(data->icon.width(), data->icon.height(), false);
+        canvas.skia_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);
+        canvas.BlitToNativeContext(
+            gfx::Rect(data->icon.width(), data->icon.height()),
+            gfx::Point(lpdis->rcItem.left + kItemLeftMargin,
+                       lpdis->rcItem.top + (lpdis->rcItem.bottom -
+                           lpdis->rcItem.top - data->icon.height()) / 2),
+            hDC);
       }
-
     } else {
       // Draw the separator
       lpdis->rcItem.top += (lpdis->rcItem.bottom - lpdis->rcItem.top) / 3;
       DrawEdge(hDC, &lpdis->rcItem, EDGE_ETCHED, BF_TOP);
     }
 
     SetBkColor(hDC, prev_bg_color);
     SetTextColor(hDC, prev_text_color);
   }
 
@@ skipping 360 matching lines @@
       break;
 
     default:
       NOTREACHED();
       return 0;
   }
   return align_flags;
 }
 
 }  // namespace views