ChromeFont->gfx::Font...

app/gfx/text_elider.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 "app/gfx/chrome_font.h"
 #include "app/gfx/text_elider.h"
 #include "base/file_path.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #include "googleurl/src/gurl.h"
@@ skipping 26 matching lines @@
 // which composed of parts from subdomain, domain, path, filename and query.
 // A "..." is added automatically at the end if the elided string is bigger
 // than the available pixel width. For available pixel width = 0, a formatted,
 // but un-elided, string is returned.
 //
 // TODO(pkasting): http://b/119635 This whole function gets
 // kerning/ligatures/etc. issues potentially wrong by assuming that the width of
 // a rendered string is always the sum of the widths of its substrings.  Also I
 // suspect it could be made simpler.
 std::wstring ElideUrl(const GURL& url,
-                      const ChromeFont& font,
+                      const gfx::Font& font,
                       int available_pixel_width,
                       const std::wstring& languages) {
   // Get a formatted string and corresponding parsing of the url.
   url_parse::Parsed parsed;
   std::wstring url_string = GetCleanStringFromUrl(url, languages, &parsed,
                                                   NULL);
   if (available_pixel_width <= 0)
     return url_string;
 
   // If non-standard or not file type, return plain eliding.
@@ skipping 206 matching lines @@
       pixel_width_dot_dot_slash + pixel_width_dots_trailer +
       font.GetStringWidth(L"UV")) // A hack to prevent trailing "../...".
     final_elided_url_string += elided_path;
   else
     final_elided_url_string += url_path;
 
   return ElideText(final_elided_url_string, font, available_pixel_width);
 }
 
 std::wstring ElideFilename(const FilePath& filename,
-                           const ChromeFont& font,
+                           const gfx::Font& font,
                            int available_pixel_width) {
   int full_width = font.GetStringWidth(filename.ToWStringHack());
   if (full_width <= available_pixel_width)
     return filename.ToWStringHack();
 
 #if defined(OS_WIN)
   std::wstring extension = filename.Extension();
 #elif defined(OS_POSIX)
   std::wstring extension = base::SysNativeMBToWide(filename.Extension());
 #endif
@@ skipping 10 matching lines @@
   if (root_width + ext_width <= available_pixel_width)
     return rootname + extension;
 
   int available_root_width = available_pixel_width - ext_width;
   return ElideText(rootname, font, available_root_width) + extension;
 }
 
 // This function adds an ellipsis at the end of the text if the text
 // does not fit the given pixel width.
 std::wstring ElideText(const std::wstring& text,
-                       const ChromeFont& font,
+                       const gfx::Font& font,
                        int available_pixel_width){
   if (text.empty())
     return text;
 
   int current_text_pixel_width = font.GetStringWidth(text);
   if (current_text_pixel_width <= available_pixel_width)
     return text;
 
   if (font.GetStringWidth(kEllipsis) > available_pixel_width)
     return std::wstring();
@@ skipping 190 matching lines @@
 string16 SortedDisplayURL::AfterHost() const {
   size_t slash_index = display_url_.find(sort_host_, prefix_end_);
   if (slash_index == string16::npos) {
     NOTREACHED();
     return string16();
   }
   return display_url_.substr(slash_index + sort_host_.length());
 }
 
 } // namespace gfx.