ChromeCanvas->gfx::Canvas

chrome/browser/views/location_bar_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_LOCATION_BAR_VIEW_H_
 #define CHROME_BROWSER_VIEWS_LOCATION_BAR_VIEW_H_
 
 #include <string>
 #include <vector>
 
-#include "app/gfx/chrome_font.h"
+#include "app/gfx/font.h"
 #include "base/gfx/rect.h"
 #include "chrome/browser/autocomplete/autocomplete_edit.h"
 #include "chrome/browser/autocomplete/autocomplete_edit_view_win.h"
 #include "chrome/browser/icon_manager.h"
 #include "chrome/browser/location_bar.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/toolbar_model.h"
 #include "chrome/browser/views/info_bubble.h"
 #include "views/controls/hwnd_view.h"
 #include "views/controls/image_view.h"
@@ skipping 49 matching lines @@
   void Update(const TabContents* tab_for_state_restoring);
 
   void SetProfile(Profile* profile);
   Profile* profile() { return profile_; }
 
   // Sizing functions
   virtual gfx::Size GetPreferredSize();
 
   // Layout and Painting functions
   virtual void Layout();
-  virtual void Paint(ChromeCanvas* canvas);
+  virtual void Paint(gfx::Canvas* canvas);
 
   // No focus border for the location bar, the caret is enough.
-  virtual void PaintFocusBorder(ChromeCanvas* canvas) { }
+  virtual void PaintFocusBorder(gfx::Canvas* canvas) { }
 
   // Called when any ancestor changes its size, asks the AutocompleteEditModel
   // to close its popup.
   virtual void VisibleBoundsInRootChanged();
 
   // Event Handlers
   virtual bool OnMousePressed(const views::MouseEvent& event);
   virtual bool OnMouseDragged(const views::MouseEvent& event);
   virtual void OnMouseReleased(const views::MouseEvent& event, bool canceled);
 
@@ skipping 47 matching lines @@
   // complete description of the keyword, the second contains a truncated
   // version of the description. The second is used if there is not enough room
   // to display the complete description.
   class SelectedKeywordView : public views::View {
    public:
     explicit SelectedKeywordView(Profile* profile);
     virtual ~SelectedKeywordView();
 
     void SetFont(const gfx::Font& font);
 
-    virtual void Paint(ChromeCanvas* canvas);
+    virtual void Paint(gfx::Canvas* canvas);
 
     virtual gfx::Size GetPreferredSize();
     virtual gfx::Size GetMinimumSize();
     virtual void Layout();
 
     // The current keyword, or an empty string if no keyword is displayed.
     void SetKeyword(const std::wstring& keyword);
     std::wstring keyword() const { return keyword_; }
 
     void set_profile(Profile* profile) { profile_ = profile; }
@@ skipping 34 matching lines @@
     explicit KeywordHintView(Profile* profile);
     virtual ~KeywordHintView();
 
     void SetFont(const gfx::Font& font);
 
     void SetColor(const SkColor& color);
 
     void SetKeyword(const std::wstring& keyword);
     std::wstring keyword() const { return keyword_; }
 
-    virtual void Paint(ChromeCanvas* canvas);
+    virtual void Paint(gfx::Canvas* canvas);
     virtual gfx::Size GetPreferredSize();
     // The minimum size is just big enough to show the tab.
     virtual gfx::Size GetMinimumSize();
     virtual void Layout();
 
     void set_profile(Profile* profile) { profile_ = profile; }
 
    private:
     views::Label leading_label_;
     views::Label trailing_label_;
@@ skipping 259 matching lines @@
   bool popup_window_mode_;
 
   // Used schedule a task for the first run info bubble.
   ScopedRunnableMethodFactory<LocationBarView> first_run_bubble_;
 
   // The positioner that places the autocomplete popup.
   AutocompletePopupPositioner* popup_positioner_;
 };
 
 #endif  // CHROME_BROWSER_VIEWS_LOCATION_BAR_VIEW_H_