ui/gfx: Make gfx::Canvas inherit from gfx::CanvasSkia.

chrome/browser/ui/views/browser_actions_container.h

 // Copyright (c) 2012 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_BROWSER_ACTIONS_CONTAINER_H_
 #define CHROME_BROWSER_UI_VIEWS_BROWSER_ACTIONS_CONTAINER_H_
 #pragma once
 
 #include <set>
 #include <string>
@@ skipping 153 matching lines @@
 class BrowserActionView : public views::View {
  public:
   BrowserActionView(const Extension* extension, BrowserActionsContainer* panel);
   virtual ~BrowserActionView();
 
   BrowserActionButton* button() { return button_; }
 
   // Allocates a canvas object on the heap and draws into it the icon for the
   // view as well as the badge (if any). Caller is responsible for deleting the
   // returned object.
-  gfx::Canvas* GetIconWithBadge();
+  gfx::CanvasSkia* GetIconWithBadge();
 
   // Overridden from views::View:
   virtual void Layout() OVERRIDE;
   virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
 
  protected:
   // Overridden from views::View to paint the badge on top of children.
-  virtual void PaintChildren(gfx::Canvas* canvas) OVERRIDE;
+  virtual void PaintChildren(gfx::CanvasSkia* canvas) OVERRIDE;
 
  private:
   // The container for this view.
   BrowserActionsContainer* panel_;
 
   // The button this view contains.
   BrowserActionButton* button_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserActionView);
 };
@@ skipping 197 matching lines @@
   // During testing we can disable animations by setting this flag to true,
   // so that the bar resizes instantly, instead of having to poll it while it
   // animates to open/closed status.
   static bool disable_animations_during_testing_;
 
  protected:
   // Overridden from views::View:
   virtual void ViewHierarchyChanged(bool is_add,
                                     views::View* parent,
                                     views::View* child) OVERRIDE;
-  virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
+  virtual void OnPaint(gfx::CanvasSkia* canvas) OVERRIDE;
   virtual void OnThemeChanged() OVERRIDE;
 
  private:
   friend class BrowserActionView;  // So it can access IconHeight().
   friend class ShowFolderMenuTask;
 
   typedef std::vector<BrowserActionView*> BrowserActionViews;
 
   // Returns the width of an icon, optionally with its padding.
   static int IconWidth(bool include_padding);
@@ skipping 116 matching lines @@
 
   base::WeakPtrFactory<BrowserActionsContainer> task_factory_;
 
   // Handles delayed showing of the overflow menu when hovering.
   base::WeakPtrFactory<BrowserActionsContainer> show_menu_task_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserActionsContainer);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_BROWSER_ACTIONS_CONTAINER_H_