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

ui/views/controls/menu/menu_item_view.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 UI_VIEWS_CONTROLS_MENU_MENU_ITEM_VIEW_H_
 #define UI_VIEWS_CONTROLS_MENU_MENU_ITEM_VIEW_H_
 #pragma once
 
 #include <string>
 #include <vector>
@@ skipping 231 matching lines @@
   // Returns the icon.
   const SkBitmap& GetIcon() const { return icon_; }
 
   // Sets the command id of this menu item.
   void SetCommand(int command) { command_ = command; }
 
   // Returns the command id of this item.
   int GetCommand() const { return command_; }
 
   // Paints the menu item.
-  virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
+  virtual void OnPaint(gfx::CanvasSkia* canvas) OVERRIDE;
 
   // Returns the preferred size of this item.
   virtual gfx::Size GetPreferredSize() OVERRIDE;
 
   // Returns the object responsible for controlling showing the menu.
   MenuController* GetMenuController();
   const MenuController* GetMenuController() const;
 
   // Returns the delegate. This returns the delegate of the root menu item.
   MenuDelegate* GetDelegate();
@@ skipping 85 matching lines @@
   // Undoes the work of AddEmptyMenus.
   void RemoveEmptyMenus();
 
   // Given bounds within our View, this helper routine mirrors the bounds if
   // necessary.
   void AdjustBoundsForRTLUI(gfx::Rect* rect) const;
 
   // Actual paint implementation. If mode is PB_FOR_DRAG, portions of the menu
   // are not rendered.
   enum PaintButtonMode { PB_NORMAL, PB_FOR_DRAG };
-  void PaintButton(gfx::Canvas* canvas, PaintButtonMode mode);
+  void PaintButton(gfx::CanvasSkia* canvas, PaintButtonMode mode);
 
 #if defined(OS_WIN)
   enum SelectionState { SELECTED, UNSELECTED };
 
   // Paints the check/radio button indicator.
-  void PaintCheck(gfx::Canvas* canvas,
+  void PaintCheck(gfx::CanvasSkia* canvas,
                   gfx::NativeTheme::State state,
                   SelectionState selection_state,
                   const MenuConfig& config);
 #endif
 
   // Paints the accelerator.
-  void PaintAccelerator(gfx::Canvas* canvas);
+  void PaintAccelerator(gfx::CanvasSkia* canvas);
 
   // Destroys the window used to display this menu and recursively destroys
   // the windows used to display all descendants.
   void DestroyAllMenuHosts();
 
   // Returns the accelerator text.
   string16 GetAcceleratorText();
 
   // Returns the various margins.
   int GetTopMargin();
@@ skipping 88 matching lines @@
   // position of the menu being shown.
   MenuPosition requested_menu_position_;
   MenuPosition actual_menu_position_;
 
   DISALLOW_COPY_AND_ASSIGN(MenuItemView);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_MENU_MENU_ITEM_VIEW_H_