ChromeCanvas->gfx::Canvas

views/controls/menu/chrome_menu.h

 // 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.
 
 #ifndef VIEWS_CONTROLS_MENU_CHROME_MENU_H_
 #define VIEWS_CONTROLS_MENU_CHROME_MENU_H_
 
 #include <list>
 #include <vector>
 
 #include "app/drag_drop_types.h"
-#include "app/gfx/chrome_font.h"
+#include "app/gfx/font.h"
 #include "base/gfx/point.h"
 #include "base/gfx/rect.h"
 #include "base/message_loop.h"
 #include "base/task.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "views/controls/menu/controller.h"
 #include "views/event.h"
 #include "views/view.h"
 
 namespace views {
@@ skipping 322 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 Paint(ChromeCanvas* canvas);
+  virtual void Paint(gfx::Canvas* canvas);
 
   // Returns the preferred size of this item.
   virtual gfx::Size GetPreferredSize();
 
   // Returns the object responsible for controlling showing the menu.
   MenuController* GetMenuController();
 
   // Returns the delegate. This returns the delegate of the root menu item.
   MenuDelegate* GetDelegate();
 
@@ skipping 48 matching lines @@
 
   // Undoes the work of AddEmptyMenus.
   void RemoveEmptyMenus();
 
   // Given bounds within our View, this helper routine mirrors the bounds if
   // necessary.
   void AdjustBoundsForRTLUI(RECT* rect) const;
 
   // Actual paint implementation. If for_drag is true, portions of the menu
   // are not rendered.
-  void Paint(ChromeCanvas* canvas, bool for_drag);
+  void Paint(gfx::Canvas* canvas, bool for_drag);
 
   // Destroys the window used to display this menu and recursively destroys
   // the windows used to display all descendants.
   void DestroyAllMenuHosts();
 
   // Returns the various margins.
   int GetTopMargin();
   int GetBottomMargin();
 
   // The delegate. This is only valid for the root menu item. You shouldn't
@@ skipping 75 matching lines @@
   // giving each child the available width.
   virtual void Layout();
   virtual gfx::Size GetPreferredSize();
 
   // View method. Overriden to schedule a paint. We do this so that when
   // scrolling occurs, everything is repainted correctly.
   virtual void DidChangeBounds(const gfx::Rect& previous,
                                const gfx::Rect& current);
 
   // Painting.
-  void PaintChildren(ChromeCanvas* canvas);
+  void PaintChildren(gfx::Canvas* canvas);
 
   // Drag and drop methods. These are forwarded to the MenuController.
   virtual bool CanDrop(const OSExchangeData& data);
   virtual void OnDragEntered(const DropTargetEvent& event);
   virtual int OnDragUpdated(const DropTargetEvent& event);
   virtual void OnDragExited();
   virtual int OnPerformDrop(const DropTargetEvent& event);
 
   // Scrolls on menu item boundaries.
   virtual bool OnMouseWheel(const MouseWheelEvent& e);
@@ skipping 40 matching lines @@
 
   // Returns the container for the SubmenuView.
   MenuScrollViewContainer* GetScrollViewContainer();
 
   // Returns the host of the menu. Returns NULL if not showing.
   MenuHost* host() const { return host_; }
 
  private:
   // Paints the drop indicator. This is only invoked if item is non-NULL and
   // position is not DROP_NONE.
-  void PaintDropIndicator(ChromeCanvas* canvas,
+  void PaintDropIndicator(gfx::Canvas* canvas,
                           MenuItemView* item,
                           MenuDelegate::DropPosition position);
 
   void SchedulePaintForDropIndicator(MenuItemView* item,
                                      MenuDelegate::DropPosition position);
 
   // Calculates the location of th edrop indicator.
   gfx::Rect CalculateDropIndicatorBounds(MenuItemView* item,
                                          MenuDelegate::DropPosition position);
 
@@ skipping 348 matching lines @@
   // Task for scrolling the menu. If non-null indicates a scroll is currently
   // underway.
   scoped_ptr<MenuScrollTask> scroll_task_;
 
   DISALLOW_EVIL_CONSTRUCTORS(MenuController);
 };
 
 }  // namespace views
 
 #endif  // VIEWS_CONTROLS_MENU_CHROME_MENU_H_