chrome/browser/ui/gtk/validation_message_bubble_gtk.cc - Issue 152343006: Clean-up: Replaces obsolete Font/FontList methods.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/gtk/validation_message_bubble_gtk.cc

Issue 152343006: Clean-up: Replaces obsolete Font/FontList methods. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Synced. Created 6 years, 10 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:

Index: chrome/browser/ui/gtk/validation_message_bubble_gtk.cc

diff --git a/chrome/browser/ui/gtk/validation_message_bubble_gtk.cc b/chrome/browser/ui/gtk/validation_message_bubble_gtk.cc

index c60c67b96ec0b1aa634e1412ae26f2eb191764b9..2a22d9157a12378aed659cc7478208c5164d3427 100644

--- a/chrome/browser/ui/gtk/validation_message_bubble_gtk.cc

+++ b/chrome/browser/ui/gtk/validation_message_bubble_gtk.cc

@@ -109,7 +109,7 @@ GtkWidget* ValidationMessageBubbleGtk::ConstructContent(

GtkWidget* sub_label = gtk_label_new(base::UTF16ToUTF8(sub_text).c_str());

const gfx::Font& sub_font = bundle.GetFont(ResourceBundle::BaseFont);

gtk_util::ForceFontSizePixels(sub_label, sub_font.GetHeight());

- int max_characters = kTextMaxWidth / sub_font.GetAverageCharacterWidth();

+ int max_characters = kTextMaxWidth / sub_font.GetExpectedTextWidth(1);

if (sub_text.length() > static_cast<size_t>(max_characters))

gtk_util::SetLabelWidth(sub_label, kTextMaxWidth);

gtk_box_pack_start(