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

Unified Diff: ui/gfx/canvas.cc

Issue 14322007: Add line height setting to views::Label & use it for notifications. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased. Created 7 years, 8 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 | « ui/gfx/canvas.h ('k') | ui/gfx/canvas_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/canvas.cc
diff --git a/ui/gfx/canvas.cc b/ui/gfx/canvas.cc
index 134c1453d2e104d7351b7abcd87f08ed215a2b3a..aac2c035bb77f79c9ca1aed1005d365a248781a9 100644
--- a/ui/gfx/canvas.cc
+++ b/ui/gfx/canvas.cc
@@ -89,7 +89,7 @@ void Canvas::RecreateBackingCanvas(const gfx::Size& size,
// static
int Canvas::GetStringWidth(const string16& text, const gfx::Font& font) {
int width = 0, height = 0;
- Canvas::SizeStringInt(text, font, &width, &height, NO_ELLIPSIS);
+ Canvas::SizeStringInt(text, font, &width, &height, 0, NO_ELLIPSIS);
return width;
}
@@ -433,6 +433,7 @@ void Canvas::DrawStringInt(const string16& text,
font,
color,
gfx::Rect(x, y, w, h),
+ 0,
flags,
ShadowValues());
}
« no previous file with comments | « ui/gfx/canvas.h ('k') | ui/gfx/canvas_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698