Revert 50784 - Canvas refactoring part 3....

chrome/browser/views/bookmark_bar_view.cc

Index: chrome/browser/views/bookmark_bar_view.cc
===================================================================
--- chrome/browser/views/bookmark_bar_view.cc	(revision 50789)
+++ chrome/browser/views/bookmark_bar_view.cc	(working copy)
@@ -37,6 +37,7 @@
 #include "chrome/common/notification_service.h"
 #include "chrome/common/page_transition_types.h"
 #include "chrome/common/pref_names.h"
+#include "gfx/canvas.h"
 #include "gfx/canvas_skia.h"
 #include "grit/app_resources.h"
 #include "grit/generated_resources.h"
@@ -242,7 +243,7 @@
     return disposition != CURRENT_TAB;
   }
 
-  virtual void Paint(gfx::Canvas* canvas) {
+  virtual void Paint(gfx::Canvas *canvas) {
     views::MenuButton::Paint(canvas, false);
   }
 
@@ -1110,7 +1111,8 @@
   for (int i = 0; i < GetBookmarkButtonCount(); ++i) {
     if (sender == GetBookmarkButton(i)) {
       views::TextButton* button = GetBookmarkButton(i);
-      gfx::CanvasSkia canvas(button->width(), button->height(), false);
+      // TODO(beng): convert to CanvasSkia
+      gfx::Canvas canvas(button->width(), button->height(), false);
       button->Paint(&canvas, true);
       drag_utils::SetDragImageOnDataObject(canvas, button->size(),
                                            press_pt, data);