Canvas refactoring part 3....

views/widget/root_view_win.cc

Index: views/widget/root_view_win.cc
===================================================================
--- views/widget/root_view_win.cc	(revision 50664)
+++ views/widget/root_view_win.cc	(working copy)
@@ -9,7 +9,6 @@
 #include "app/os_exchange_data_provider_win.h"
 #include "base/base_drag_source.h"
 #include "base/logging.h"
-#include "gfx/canvas_2.h"
 #include "gfx/canvas_skia.h"
 
 namespace views {
@@ -25,12 +24,12 @@
     RECT win_version = original_dirty_region.ToRECT();
     InvalidateRect(hwnd, &win_version, FALSE);
   }
-  scoped_ptr<gfx::CanvasPaint2> canvas(
-      gfx::CanvasPaint2::CreateCanvasPaint(hwnd));
+  scoped_ptr<gfx::CanvasPaint> canvas(
+      gfx::CanvasPaint::CreateCanvasPaint(hwnd));
   if (!canvas->IsValid()) {
     SchedulePaint(canvas->GetInvalidRect(), false);
     if (NeedsPainting(false))
-      ProcessPaint(canvas->AsCanvas2()->AsCanvas());
+      ProcessPaint(canvas->AsCanvas());
   }
 }