ChromeFont->gfx::Font...

chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc

 // 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.
 
 #include "chrome/browser/autocomplete/autocomplete_popup_view_gtk.h"
 
 #include <gtk/gtk.h>
 
 #include <algorithm>
 
@@ skipping 42 matching lines @@
 // Space between the left edge (including the border) and the text.
 const int kIconAreaWidth =
     kIconLeftPadding + kIconWidth + kIconRightPadding;
 // Space between the right edge (including the border) and the text.
 const int kRightPadding = 3;
 // When we have both a content and description string, we don't want the
 // content to push the description off.  Limit the content to a percentage of
 // the total width.
 const float kContentWidthPercentage = 0.7;
 
-// TODO(deanm): We should put this on ChromeFont so it can be shared.
+// TODO(deanm): We should put this on gfx::Font so it can be shared.
 // Returns a new pango font, free with pango_font_description_free().
-PangoFontDescription* PangoFontFromChromeFont(const ChromeFont& chrome_font) {
-  ChromeFont font = chrome_font;  // Copy so we can call non-const methods.
+PangoFontDescription* PangoFontFromGfxFont(const gfx::Font& chrome_font) {
+  gfx::Font font = chrome_font;  // Copy so we can call non-const methods.
   PangoFontDescription* pfd = pango_font_description_new();
   pango_font_description_set_family(pfd, WideToUTF8(font.FontName()).c_str());
   pango_font_description_set_size(pfd, font.FontSize() * PANGO_SCALE);
 
   switch (font.style()) {
-    case ChromeFont::NORMAL:
+    case gfx::Font::NORMAL:
       // Nothing to do, should already be PANGO_STYLE_NORMAL.
       break;
-    case ChromeFont::BOLD:
+    case gfx::Font::BOLD:
       pango_font_description_set_weight(pfd, PANGO_WEIGHT_BOLD);
       break;
-    case ChromeFont::ITALIC:
+    case gfx::Font::ITALIC:
       pango_font_description_set_style(pfd, PANGO_STYLE_ITALIC);
       break;
-    case ChromeFont::UNDERLINED:
+    case gfx::Font::UNDERLINED:
       // TODO(deanm): How to do underlined?  Where do we use it?  Probably have
       // to paint it ourselves, see pango_font_metrics_get_underline_position.
       break;
   }
 
   return pfd;
 }
 
 // Return a Rect covering the whole area of |window|.
 gfx::Rect GetWindowRect(GdkWindow* window) {
@@ skipping 147 matching lines @@
   // Set the background color, so we don't need to paint it manually.
   gtk_widget_modify_bg(window_, GTK_STATE_NORMAL, &kBackgroundColor);
 
   // Cache the layout so we don't have to create it for every expose.  If we
   // were a real widget we should handle changing directions, but we're not
   // doing RTL or anything yet, so it shouldn't be important now.
   layout_ = gtk_widget_create_pango_layout(window_, NULL);
   // We always ellipsize when drawing our text runs.
   pango_layout_set_ellipsize(layout_, PANGO_ELLIPSIZE_END);
   // TODO(deanm): We might want to eventually follow what Windows does and
-  // plumb a ChromeFont through.  This is because popup windows have a
+  // plumb a gfx::Font through.  This is because popup windows have a
   // different font size, although we could just derive that font here.
-  PangoFontDescription* pfd = PangoFontFromChromeFont(ChromeFont());
+  PangoFontDescription* pfd = PangoFontFromGfxFont(gfx::Font());
   pango_layout_set_font_description(layout_, pfd);
   pango_font_description_free(pfd);
 
   gtk_widget_add_events(window_, GDK_BUTTON_MOTION_MASK |
                                  GDK_POINTER_MOTION_MASK |
                                  GDK_BUTTON_PRESS_MASK |
                                  GDK_BUTTON_RELEASE_MASK);
   g_signal_connect(window_, "motion-notify-event",
                    G_CALLBACK(&HandleMotionThunk), this);
   g_signal_connect(window_, "button-press-event",
@@ skipping 211 matching lines @@
       gdk_draw_layout(drawable, gc,
                       kIconAreaWidth + actual_content_width, content_y,
                       layout_);
     }
   }
 
   g_object_unref(gc);
 
   return TRUE;
 }