ChromeCanvas->gfx::Canvas

chrome/browser/views/bookmark_bar_view.cc

 // Copyright (c) 2006-2008 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 <limits>
 
-#include "app/gfx/chrome_canvas.h"
+#include "app/gfx/canvas.h"
 #include "app/gfx/text_elider.h"
 #include "app/l10n_util.h"
 #include "app/os_exchange_data.h"
 #include "app/resource_bundle.h"
 #include "app/win_util.h"
 #include "base/string_util.h"
 #include "base/base_drag_source.h"
 #include "chrome/browser/bookmarks/bookmark_context_menu.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/browser.h"
@@ skipping 229 matching lines @@
       show_animation_->Show();
     }
   }
 
   virtual bool IsTriggerableEvent(const views::MouseEvent& e) {
     // This is hard coded to avoid potential notification on left mouse down,
     // which we want to show the menu.
     return e.IsMiddleMouseButton();
   }
 
-  virtual void Paint(ChromeCanvas *canvas) {
+  virtual void Paint(gfx::Canvas *canvas) {
     views::MenuButton::Paint(canvas, false);
   }
 
  private:
   scoped_ptr<SlideAnimation> show_animation_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkFolderButton);
 };
 
 // DropInfo -------------------------------------------------------------------
@@ skipping 33 matching lines @@
   BookmarkDragData data;
 };
 
 // ButtonSeparatorView  --------------------------------------------------------
 
 class ButtonSeparatorView : public views::View {
  public:
   ButtonSeparatorView() {}
   virtual ~ButtonSeparatorView() {}
 
-  virtual void Paint(ChromeCanvas* canvas) {
+  virtual void Paint(gfx::Canvas* canvas) {
     SkPaint paint;
     paint.setShader(skia::CreateGradientShader(0,
                                                height() / 2,
                                                kTopBorderColor,
                                                kSeparatorColor))->safeUnref();
     SkRect rc = {SkIntToScalar(kSeparatorStartX),  SkIntToScalar(0),
                  SkIntToScalar(1), SkIntToScalar(height() / 2) };
     canvas->drawRect(rc, paint);
 
     SkPaint paint_down;
@@ skipping 223 matching lines @@
                                            View* parent,
                                            View* child) {
   if (is_add && child == this && height() > 0) {
     // We only layout while parented. When we become parented, if our bounds
     // haven't changed, DidChangeBounds won't get invoked and we won't layout.
     // Therefore we always force a layout when added.
     Layout();
   }
 }
 
-void BookmarkBarView::Paint(ChromeCanvas* canvas) {
+void BookmarkBarView::Paint(gfx::Canvas* canvas) {
   if (IsDetachedStyle()) {
     // Draw the background to match the new tab page.
     canvas->FillRectInt(kNewtabBackgroundColor, 0, 0, width(), height());
 
     // Draw the 'bottom' of the toolbar above our bubble.
     canvas->FillRectInt(ResourceBundle::toolbar_separator_color,
                         0, 0, width(), 1);
 
     SkRect rect;
 
@@ skipping 41 matching lines @@
 
     // +1 is for toolbar outdent.
     canvas->TileImageInt(*GetThemeProvider()->
         GetBitmapNamed(IDR_THEME_TOOLBAR),
         bounds.x() + 1, bounds.y(), 0, 0, width(), height());
     canvas->FillRectInt(ResourceBundle::toolbar_separator_color,
                         0, height() - 1, width(), 1);
   }
 }
 
-void BookmarkBarView::PaintChildren(ChromeCanvas* canvas) {
+void BookmarkBarView::PaintChildren(gfx::Canvas* canvas) {
   View::PaintChildren(canvas);
 
   if (drop_info_.get() && drop_info_->valid &&
       drop_info_->drag_operation != 0 && drop_info_->drop_index != -1 &&
       !drop_info_->is_over_overflow && !drop_info_->drop_on) {
     int index = drop_info_->drop_index;
     DCHECK(index <= GetBookmarkButtonCount());
     int x = 0;
     int y = 0;
     int h = height();
@@ skipping 255 matching lines @@
 MenuButton* BookmarkBarView::CreateOverflowButton() {
   MenuButton* button = new MenuButton(NULL, std::wstring(), this, false);
   button->SetIcon(*ResourceBundle::GetSharedInstance().
                   GetBitmapNamed(IDR_BOOKMARK_BAR_CHEVRONS));
 
   // The overflow button's image contains an arrow and therefore it is a
   // direction sensitive image and we need to flip it if the UI layout is
   // right-to-left.
   //
   // By default, menu buttons are not flipped because they generally contain
-  // text and flipping the ChromeCanvas object will break text rendering. Since
+  // text and flipping the gfx::Canvas object will break text rendering. Since
   // the overflow button does not contain text, we can safely flip it.
   button->EnableCanvasFlippingForRTLUI(true);
 
   // Make visible as necessary.
   button->SetVisible(false);
   return button;
 }
 
 int BookmarkBarView::GetBookmarkButtonCount() {
   // We contain at least four non-bookmark button views: recently bookmarked,
@@ skipping 140 matching lines @@
 
 void BookmarkBarView::WriteDragData(View* sender,
                                     int press_x,
                                     int press_y,
                                     OSExchangeData* data) {
   UserMetrics::RecordAction(L"BookmarkBar_DragButton", profile_);
 
   for (int i = 0; i < GetBookmarkButtonCount(); ++i) {
     if (sender == GetBookmarkButton(i)) {
       views::TextButton* button = GetBookmarkButton(i);
-      ChromeCanvas canvas(button->width(), button->height(), false);
+      gfx::Canvas canvas(button->width(), button->height(), false);
       button->Paint(&canvas, true);
       drag_utils::SetDragImageOnDataObject(canvas, button->width(),
                                            button->height(), press_x,
                                            press_y, data);
       WriteDragData(model_->GetBookmarkBarNode()->GetChild(i), data);
       return;
     }
   }
   NOTREACHED();
 }
@@ skipping 465 matching lines @@
 }
 
 void BookmarkBarView::StopThrobbing(bool immediate) {
   if (!throbbing_view_)
     return;
 
   // If not immediate, cycle through 2 more complete cycles.
   throbbing_view_->StartThrobbing(immediate ? 0 : 4);
   throbbing_view_ = NULL;
 }