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

views/native_theme_painter.cc

Index: views/native_theme_painter.cc
===================================================================
--- views/native_theme_painter.cc	(revision 82144)
+++ views/native_theme_painter.cc	(working copy)
@@ -25,7 +25,7 @@
 void NativeThemePainter::Paint(int w, int h, gfx::Canvas* canvas) {
   const gfx::NativeTheme* native_theme = gfx::NativeTheme::instance();
   gfx::NativeTheme::Part part = delegate_->GetThemePart();
-  gfx::CanvasSkia* skia_canvas = canvas->AsCanvasSkia();
+  gfx::CanvasSkia* canvas_skia = canvas->AsCanvasSkia();
   gfx::Rect rect(0, 0, w, h);
 
   if (delegate_->GetThemeAnimation() != NULL &&
@@ -34,19 +34,20 @@
     gfx::NativeTheme::ExtraParams prev_extra;
     gfx::NativeTheme::State prev_state =
         delegate_->GetBackgroundThemeState(&prev_extra);
-    native_theme->Paint(skia_canvas, part, prev_state, rect, prev_extra);
+    native_theme->Paint(canvas_skia->skia_canvas(),
+        part, prev_state, rect, prev_extra);
 
     // Composite foreground state above it.
     gfx::NativeTheme::ExtraParams extra;
     gfx::NativeTheme::State state = delegate_->GetForegroundThemeState(&extra);
     int alpha = delegate_->GetThemeAnimation()->CurrentValueBetween(0, 255);
-    skia_canvas->SaveLayerAlpha(static_cast<uint8>(alpha));
-    native_theme->Paint(skia_canvas, part, state, rect, extra);
-    skia_canvas->Restore();
+    canvas_skia->SaveLayerAlpha(static_cast<uint8>(alpha));
+    native_theme->Paint(canvas_skia->skia_canvas(), part, state, rect, extra);
+    canvas_skia->Restore();
   } else {
     gfx::NativeTheme::ExtraParams extra;
     gfx::NativeTheme::State state = delegate_->GetThemeState(&extra);
-    native_theme->Paint(skia_canvas, part, state, rect, extra);
+    native_theme->Paint(canvas_skia->skia_canvas(), part, state, rect, extra);
   }
 }