ChromeFont->gfx::Font...

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>
 
@@ skipping 129 matching lines @@
   //
   // SelectedKeywordView maintains two labels. One label contains the
   // 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 ChromeFont& font);
+    void SetFont(const gfx::Font& font);
 
     virtual void Paint(ChromeCanvas* 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_; }
@@ skipping 29 matching lines @@
   // Internally KeywordHintView uses two labels to render the text, and draws
   // the tab image itself.
   //
   // NOTE: This should really be called LocationBarKeywordHintView, but I
   // couldn't bring myself to use such a long name.
   class KeywordHintView : public views::View {
    public:
     explicit KeywordHintView(Profile* profile);
     virtual ~KeywordHintView();
 
-    void SetFont(const ChromeFont& font);
+    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 gfx::Size GetPreferredSize();
     // The minimum size is just big enough to show the tab.
     virtual gfx::Size GetMinimumSize();
@@ skipping 226 matching lines @@
   // entered or selected.
   std::wstring location_input_;
 
   // The user's desired disposition for how their input should be opened
   WindowOpenDisposition disposition_;
 
   // The transition type to use for the navigation
   PageTransition::Type transition_;
 
   // Font used by edit and some of the hints.
-  ChromeFont font_;
+  gfx::Font font_;
 
   // Location_entry view wrapper
   views::HWNDView* location_entry_view_;
 
   // The following views are used to provide hints and remind the user as to
   // what is going in the edit. They are all added a children of the
   // LocationBarView. At most one is visible at a time. Preference is
   // given to the keyword_view_, then hint_view_, then type_to_search_view_.
 
   // Shown if the user has selected a keyword.
@@ skipping 19 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_