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

views/controls/menu/menu_item_view_win.cc

 // 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_item_view.h"
 
 #include <uxtheme.h>
 #include <Vssym32.h>
 
 #include "grit/app_strings.h"
@@ skipping 31 matching lines @@
                                        NativeTheme::kNormal;
   }
 
   // The gutter is rendered before the background.
   if (config.render_gutter && mode == PB_NORMAL) {
     gfx::Rect gutter_bounds(label_start_ - config.gutter_to_label -
                             config.gutter_width, 0, config.gutter_width,
                             height());
     AdjustBoundsForRTLUI(&gutter_bounds);
     NativeTheme::ExtraParams extra;
-    NativeTheme::instance()->Paint(canvas->AsCanvasSkia(),
+    NativeTheme::instance()->Paint(canvas->AsCanvasSkia()->skia_canvas(),
                                    NativeTheme::kMenuPopupGutter,
                                    NativeTheme::kNormal,
                                    gutter_bounds,
                                    extra);
   }
 
   // Render the background.
   if (mode == PB_NORMAL) {
     gfx::Rect item_bounds(0, 0, width(), height());
     NativeTheme::ExtraParams extra;
     extra.menu_item.is_selected = render_selection;
     AdjustBoundsForRTLUI(&item_bounds);
-    NativeTheme::instance()->Paint(canvas->AsCanvasSkia(),
+    NativeTheme::instance()->Paint(canvas->AsCanvasSkia()->skia_canvas(),
         NativeTheme::kMenuItemBackground, control_state, item_bounds, extra);
   }
 
   int top_margin = GetTopMargin();
   int bottom_margin = GetBottomMargin();
 
   if ((type_ == RADIO || type_ == CHECKBOX) &&
       GetDelegate()->IsItemChecked(GetCommand())) {
     PaintCheck(canvas, control_state, config);
   }
@@ skipping 44 matching lines @@
     gfx::Rect arrow_bounds(this->width() - item_right_margin_ +
                            config.label_to_arrow_padding, 0,
                            config.arrow_width, height());
     AdjustBoundsForRTLUI(&arrow_bounds);
 
     // If our sub menus open from right to left (which is the case when the
     // locale is RTL) then we should make sure the menu arrow points to the
     // right direction.
     gfx::NativeTheme::ExtraParams extra;
     extra.menu_arrow.pointing_right = !base::i18n::IsRTL();
-    gfx::NativeTheme::instance()->Paint(canvas->AsCanvasSkia(),
+    gfx::NativeTheme::instance()->Paint(canvas->AsCanvasSkia()->skia_canvas(),
         gfx::NativeTheme::kMenuPopupArrow, control_state, arrow_bounds, extra);
   }
 }
 
 void MenuItemView::PaintCheck(gfx::Canvas* canvas,
                               NativeTheme::State state,
                               const MenuConfig& config) {
   int icon_width;
   int icon_height;
   if (type_ == RADIO) {
     icon_width = config.radio_width;
     icon_height = config.radio_height;
   } else {
     icon_width = config.check_width;
     icon_height = config.check_height;
   }
 
   int top_margin = GetTopMargin();
   int icon_x = MenuConfig::instance().item_left_margin;
   int icon_y = top_margin +
       (height() - top_margin - GetBottomMargin() - icon_height) / 2;
   NativeTheme::ExtraParams extra;
   extra.menu_check.is_radio = type_ == RADIO;
 
   // Draw the background.
   gfx::Rect bg_bounds(0, 0, icon_x + icon_width, height());
   AdjustBoundsForRTLUI(&bg_bounds);
-  NativeTheme::instance()->Paint(canvas->AsCanvasSkia(),
+  NativeTheme::instance()->Paint(canvas->AsCanvasSkia()->skia_canvas(),
       NativeTheme::kMenuCheckBackground, state, bg_bounds, extra);
 
   // And the check.
   gfx::Rect icon_bounds(icon_x / 2, icon_y, icon_width, icon_height);
   AdjustBoundsForRTLUI(&icon_bounds);
-  NativeTheme::instance()->Paint(canvas->AsCanvasSkia(),
+  NativeTheme::instance()->Paint(canvas->AsCanvasSkia()->skia_canvas(),
       NativeTheme::kMenuCheck, state, bg_bounds, extra);
 }
 
 }  // namespace views