ChromeFont->gfx::Font...

chrome/browser/views/about_chrome_view.cc

 // 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.
 
 #include "chrome/browser/views/about_chrome_view.h"
 
 #include <commdlg.h>
 
 #include "app/gfx/chrome_canvas.h"
 #include "app/gfx/color_utils.h"
@@ skipping 208 matching lines @@
                            main_label_chunk2_ + open_source_url_->GetText() +
                            main_label_chunk3_;
 
   dialog_dimensions_ = views::Window::GetLocalizedContentsSize(
       IDS_ABOUT_DIALOG_WIDTH_CHARS,
       IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES);
 
   // Create a label and add the full text so we can query it for the height.
   views::Label dummy_text(full_text);
   dummy_text.SetMultiLine(true);
-  ChromeFont font =
+  gfx::Font font =
       ResourceBundle::GetSharedInstance().GetFont(ResourceBundle::BaseFont);
 
   // Add up the height of the various elements on the page.
   int height = about_background_logo->height() +
                kRelatedControlVerticalSpacing +
                font.height() +                // Copyright line.
                dummy_text.GetHeightForWidth(  // Main label.
                    dialog_dimensions_.width() - (2 * kPanelHorizMargin)) +
                kRelatedControlVerticalSpacing;
 
@@ skipping 113 matching lines @@
 
 void AboutChromeView::Paint(ChromeCanvas* canvas) {
   views::View::Paint(canvas);
 
   // Draw the background image color (and the separator) across the dialog.
   // This will become the background for the logo image at the top of the
   // dialog.
   canvas->TileImageInt(*kBackgroundBmp, 0, 0,
                        dialog_dimensions_.width(), kBackgroundBmp->height());
 
-  ChromeFont font =
-    ResourceBundle::GetSharedInstance().GetFont(ResourceBundle::BaseFont);
+  gfx::Font font =
+      ResourceBundle::GetSharedInstance().GetFont(ResourceBundle::BaseFont);
 
   const gfx::Rect label_bounds = main_text_label_->bounds();
 
   views::Link* link1 =
       chromium_url_appears_first_ ? chromium_url_ : open_source_url_;
   views::Link* link2 =
       chromium_url_appears_first_ ? open_source_url_ : chromium_url_;
   gfx::Rect* rect1 = chromium_url_appears_first_ ?
       &chromium_url_rect_ : &open_source_url_rect_;
   gfx::Rect* rect2 = chromium_url_appears_first_ ?
@@ skipping 48 matching lines @@
   // Save the height so we can set the bounds correctly.
   main_text_label_height_ = position.height() + font.height();
 }
 
 void AboutChromeView::DrawTextAndPositionUrl(ChromeCanvas* canvas,
                                              const std::wstring& text,
                                              views::Link* link,
                                              gfx::Rect* rect,
                                              gfx::Size* position,
                                              const gfx::Rect& bounds,
-                                             const ChromeFont& font) {
+                                             const gfx::Font& font) {
   DCHECK(canvas && position);
 
   // What we get passed in as |text| is potentially a mix of LTR and RTL "runs"
   // (a run is a sequence of words that share the same directionality). We
   // initialize a bidirectional ICU line iterator and split the text into runs
   // that are either strictly LTR or strictly RTL (and do not contain a mix).
   l10n_util::BiDiLineIterator bidi_line;
   if (!bidi_line.Open(text.c_str(), true, false))
     return;
 
@@ skipping 32 matching lines @@
     rect->Offset(bounds.x(), bounds.y());
     // And leave some space to draw the link in.
     position->Enlarge(sz.width(), 0);
   }
 }
 
 void AboutChromeView::DrawTextStartingFrom(ChromeCanvas* canvas,
                                            const std::wstring& text,
                                            gfx::Size* position,
                                            const gfx::Rect& bounds,
-                                           const ChromeFont& font,
+                                           const gfx::Font& font,
                                            bool ltr_within_rtl) {
   // Iterate through line breaking opportunities (which in English would be
   // spaces and such. This tells us where to wrap.
   WordIterator iter(text, WordIterator::BREAK_LINE);
   if (!iter.Init())
     return;
 
   int flags = (text_direction_is_rtl_ ?
                    ChromeCanvas::TEXT_ALIGN_RIGHT :
                    ChromeCanvas::TEXT_ALIGN_LEFT) |
@@ skipping 322 matching lines @@
 
   // We have updated controls on the parent, so we need to update its layout.
   View* parent = GetParent();
   parent->Layout();
 
   // Check button may have appeared/disappeared. We cannot call this during
   // ViewHierarchyChanged because the |window()| pointer hasn't been set yet.
   if (window())
     GetDialogClientView()->UpdateDialogButtons();
 }