ChromeCanvas->gfx::Canvas

chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h

 // Copyright (c) 2009 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_AUTOCOMPLETE_AUTOCOMPLETE_POPUP_CONTENTS_VIEW_H_
 #define CHROME_BROWSER_VIEWS_AUTOCOMPLETE_AUTOCOMPLETE_POPUP_CONTENTS_VIEW_H_
 
-#include "app/gfx/chrome_font.h"
+#include "app/gfx/font.h"
 #include "chrome/browser/autocomplete/autocomplete.h"
 #include "chrome/browser/autocomplete/autocomplete_popup_model.h"
 #include "chrome/browser/autocomplete/autocomplete_popup_view.h"
 #include "views/view.h"
 #include "webkit/glue/window_open_disposition.h"
 
 class AutocompleteEditModel;
 class AutocompleteEditViewWin;
 class AutocompletePopupWin;
 class Profile;
@@ skipping 51 matching lines @@
 
   // Overridden from AutocompleteResultViewModel:
   virtual bool IsSelectedIndex(size_t index) const;
   virtual bool IsBookmarkedIndex(size_t index) const;
   virtual const AutocompleteMatch& GetMatchAtIndex(size_t index) const;
   virtual void OpenIndex(size_t index, WindowOpenDisposition disposition);
   virtual void SetHoveredLine(size_t index);
   virtual void SetSelectedLine(size_t index, bool revert_to_default);
 
   // Overridden from views::View:
-  virtual void PaintChildren(ChromeCanvas* canvas);
+  virtual void PaintChildren(gfx::Canvas* canvas);
   virtual void Layout();
 
  private:
   // Fill a path for the contents' roundrect. |bounding_rect| is the rect that
   // bounds the path.
   void MakeContentsPath(gfx::Path* path, const gfx::Rect& bounding_rect);
 
   // Updates the window's blur region for the current size.
   void UpdateBlurRegion();
 
   // Makes the contents of the canvas slightly transparent.
-  void MakeCanvasTransparent(ChromeCanvas* canvas);
+  void MakeCanvasTransparent(gfx::Canvas* canvas);
 
   // The popup that contains this view.
   AutocompletePopupWin* popup_;
 
   // The provider of our result set.
   scoped_ptr<AutocompletePopupModel> model_;
 
   // The edit view that invokes us.
   AutocompleteEditViewWin* edit_view_;
 
   // An object that tells the popup how to position itself.
   AutocompletePopupPositioner* popup_positioner_;
 
   // The font that we should use for result rows. This is based on the font used
   // by the edit that created us.
   gfx::Font result_font_;
 
   DISALLOW_COPY_AND_ASSIGN(AutocompletePopupContentsView);
 };
 
 
 #endif  // #ifndef CHROME_BROWSER_VIEWS_AUTOCOMPLETE_AUTOCOMPLETE_POPUP_CONTENTS_VIEW_H_