Canvas refactoring part 2....

chrome/browser/views/browser_actions_container.h

 // 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.
 
 #ifndef CHROME_BROWSER_VIEWS_BROWSER_ACTIONS_CONTAINER_H_
 #define CHROME_BROWSER_VIEWS_BROWSER_ACTIONS_CONTAINER_H_
 
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 16 matching lines @@
 class Browser;
 class BrowserActionsContainer;
 class BrowserActionOverflowMenuController;
 class BrowserActionsContainer;
 class Extension;
 class ExtensionAction;
 class ExtensionPopup;
 class PrefService;
 class Profile;
 
+namespace gfx {
+class CanvasSkia;
+}
+
 namespace views {
 class Menu2;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserActionButton
 
 // The BrowserActionButton is a specialization of the MenuButton class.
 // It acts on a ExtensionAction, in this case a BrowserAction and handles
 // loading the image for the button asynchronously on the file thread.
@@ skipping 96 matching lines @@
 class BrowserActionView : public views::View {
  public:
   BrowserActionView(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();
 
   // Accessibility accessors, overridden from View.
   virtual bool GetAccessibleRole(AccessibilityTypes::Role* role);
 
  private:
   virtual void Layout();
 
   // Override PaintChildren so that we can paint the badge on top of children.
   virtual void PaintChildren(gfx::Canvas* canvas);
 
@@ skipping 331 matching lines @@
 
   ScopedRunnableMethodFactory<BrowserActionsContainer> task_factory_;
 
   // Handles delayed showing of the overflow menu when hovering.
   ScopedRunnableMethodFactory<BrowserActionsContainer> show_menu_task_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserActionsContainer);
 };
 
 #endif  // CHROME_BROWSER_VIEWS_BROWSER_ACTIONS_CONTAINER_H_