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

Unified Diff: ui/gfx/text_elider.h

Issue 24883002: Uses and returns the fractional width in text eliding (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix per feedbacks Created 7 years, 2 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
Index: ui/gfx/text_elider.h
diff --git a/ui/gfx/text_elider.h b/ui/gfx/text_elider.h
index ff0cef0163e15a8c32b52af1b90d38ce6152892c..8ea19213bf488305eac83d3b49faf3f47021aa2c 100644
--- a/ui/gfx/text_elider.h
+++ b/ui/gfx/text_elider.h
@@ -41,11 +41,11 @@ GFX_EXPORT extern const char16 kEllipsisUTF16[];
// extra width).
GFX_EXPORT string16 ElideEmail(const string16& email,
const gfx::FontList& font_list,
- int available_pixel_width);
+ float available_pixel_width);
// Obsolete version. Use the above version which takes gfx::FontList.
GFX_EXPORT string16 ElideEmail(const string16& email,
const gfx::Font& font,
- int available_pixel_width);
+ float available_pixel_width);
// This function takes a GURL object and elides it. It returns a string
// which composed of parts from subdomain, domain, path, filename and query.
@@ -63,12 +63,12 @@ GFX_EXPORT string16 ElideEmail(const string16& email,
// http://crbug.com/6487 for more information.
GFX_EXPORT string16 ElideUrl(const GURL& url,
const gfx::FontList& font_list,
- int available_pixel_width,
+ float available_pixel_width,
const std::string& languages);
// Obsolete version. Use the above version which takes gfx::FontList.
GFX_EXPORT string16 ElideUrl(const GURL& url,
const gfx::Font& font,
- int available_pixel_width,
+ float available_pixel_width,
const std::string& languages);
enum ElideBehavior {
@@ -84,12 +84,12 @@ enum ElideBehavior {
// |elide_behavior|.
GFX_EXPORT string16 ElideText(const string16& text,
const gfx::FontList& font_list,
- int available_pixel_width,
+ float available_pixel_width,
ElideBehavior elide_behavior);
// Obsolete version. Use the above version which takes gfx::FontList.
GFX_EXPORT string16 ElideText(const string16& text,
const gfx::Font& font,
- int available_pixel_width,
+ float available_pixel_width,
ElideBehavior elide_behavior);
// Elide a filename to fit a given pixel width, with an emphasis on not hiding
@@ -100,11 +100,11 @@ GFX_EXPORT string16 ElideText(const string16& text,
// PDF (Pop Directional Formatting) mark.
GFX_EXPORT string16 ElideFilename(const base::FilePath& filename,
const gfx::FontList& font_list,
- int available_pixel_width);
+ float available_pixel_width);
// Obsolete version. Use the above version which takes gfx::FontList.
GFX_EXPORT string16 ElideFilename(const base::FilePath& filename,
const gfx::Font& font,
- int available_pixel_width);
+ float available_pixel_width);
// SortedDisplayURL maintains a string from a URL suitable for display to the
// use. SortedDisplayURL also provides a function used for comparing two
@@ -208,14 +208,14 @@ enum ReformattingResultFlags {
// leading to elision or truncation (and not just reformatting).
GFX_EXPORT int ElideRectangleText(const string16& text,
const gfx::FontList& font_list,
- int available_pixel_width,
+ float available_pixel_width,
int available_pixel_height,
WordWrapBehavior wrap_behavior,
std::vector<string16>* lines);
// Obsolete version. Use the above version which takes gfx::FontList.
GFX_EXPORT int ElideRectangleText(const string16& text,
const gfx::Font& font,
- int available_pixel_width,
+ float available_pixel_width,
int available_pixel_height,
WordWrapBehavior wrap_behavior,
std::vector<string16>* lines);

Powered by Google App Engine
This is Rietveld 408576698