Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1103)

Unified Diff: app/gfx/text_elider.cc

Issue 113441: ChromeFont->gfx::Font... (Closed) Base URL: svn://chrome-svn.corp.google.com/chrome/trunk/src/
Patch Set: Created 11 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « app/gfx/text_elider.h ('k') | app/gfx/text_elider_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: app/gfx/text_elider.cc
===================================================================
--- app/gfx/text_elider.cc (revision 16106)
+++ app/gfx/text_elider.cc (working copy)
@@ -44,7 +44,7 @@
// 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.
@@ -271,7 +271,7 @@
}
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)
@@ -302,7 +302,7 @@
// 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;
« no previous file with comments | « app/gfx/text_elider.h ('k') | app/gfx/text_elider_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698