Revert 50784 - Canvas refactoring part 3....

chrome/browser/views/bookmark_bar_view.cc

 // Copyright (c) 2010 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 "chrome/browser/views/bookmark_bar_view.h"
 
 #include <algorithm>
 #include <limits>
 #include <set>
 #include <vector>
@@ skipping 19 matching lines @@
 #include "chrome/browser/tab_contents/page_navigator.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/view_ids.h"
 #include "chrome/browser/views/bookmark_context_menu.h"
 #include "chrome/browser/views/event_utils.h"
 #include "chrome/browser/views/frame/browser_view.h"
 #include "chrome/browser/views/location_bar/location_bar_view.h"
 #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"
 #include "grit/theme_resources.h"
 #include "views/controls/button/menu_button.h"
 #include "views/controls/label.h"
 #include "views/controls/menu/menu_item_view.h"
 #include "views/drag_utils.h"
 #include "views/view_constants.h"
 #include "views/widget/tooltip_manager.h"
@@ skipping 185 matching lines @@
     // the context menu. They should not trigger the opening of underlying urls.
     if (e.GetFlags() == views::MouseEvent::EF_LEFT_BUTTON_DOWN ||
         e.GetFlags() == views::MouseEvent::EF_RIGHT_BUTTON_DOWN)
       return false;
 
     WindowOpenDisposition disposition(
         event_utils::DispositionFromEventFlags(e.GetFlags()));
     return disposition != CURRENT_TAB;
   }
 
-  virtual void Paint(gfx::Canvas* canvas) {
+  virtual void Paint(gfx::Canvas *canvas) {
     views::MenuButton::Paint(canvas, false);
   }
 
  private:
   scoped_ptr<SlideAnimation> show_animation_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkFolderButton);
 };
 
 // OverFlowButton (chevron) --------------------------------------------------
@@ skipping 847 matching lines @@
 
 void BookmarkBarView::WriteDragData(View* sender,
                                     const gfx::Point& press_pt,
                                     OSExchangeData* data) {
   UserMetrics::RecordAction(UserMetricsAction("BookmarkBar_DragButton"),
                             profile_);
 
   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);
       WriteDragData(model_->GetBookmarkBarNode()->GetChild(i), data);
       return;
     }
   }
   NOTREACHED();
 }
 
@@ skipping 619 matching lines @@
 
 void BookmarkBarView::CheckIntegrity() {
   // We better be on the ui thread.
   CHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
 
   // And the number of views on the bookmark bar better match that of the model.
   volatile int model_count = model_->GetBookmarkBarNode()->GetChildCount();
   volatile int view_count = GetBookmarkButtonCount();
   CHECK_EQ(model_count, view_count);
 }