Canvas refactoring part 2....

views/controls/menu/menu_controller.cc

Index: views/controls/menu/menu_controller.cc
===================================================================
--- views/controls/menu/menu_controller.cc	(revision 50452)
+++ views/controls/menu/menu_controller.cc	(working copy)
@@ -9,7 +9,7 @@
 #include "base/i18n/rtl.h"
 #include "base/keyboard_codes.h"
 #include "base/time.h"
-#include "gfx/canvas.h"
+#include "gfx/canvas_skia.h"
 #include "views/controls/button/menu_button.h"
 #include "views/controls/menu/menu_scroll_view_container.h"
 #include "views/controls/menu/submenu_view.h"
@@ -469,12 +469,12 @@
       gfx::Point press_loc(press_pt_);
       View::ConvertPointToScreen(source->GetScrollViewContainer(), &press_loc);
       View::ConvertPointToView(NULL, item, &press_loc);
-      gfx::Canvas canvas(item->width(), item->height(), false);
-      item->Paint(&canvas, true);
+      gfx::CanvasSkia canvas(item->width(), item->height(), false);
+      item->Paint(canvas.AsCanvas(), true);
 
       OSExchangeData data;
       item->GetDelegate()->WriteDragData(item, &data);
-      drag_utils::SetDragImageOnDataObject(canvas, item->size(), press_loc,
+      drag_utils::SetDragImageOnDataObject(*canvas.AsCanvas(), item->size(), press_loc,
                                            &data);
       StopScrolling();
       int drag_ops = item->GetDelegate()->GetDragOperations(item);