printing/print_settings_initializer.cc - Issue 8392017: Change string16 to std::string in the gfx::Font() interface.

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: printing/print_settings_initializer.cc

Issue 8392017: Change string16 to std::string in the gfx::Font() interface. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Fix mac unit tests Created 9 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:

Index: printing/print_settings_initializer.cc

diff --git a/printing/print_settings_initializer.cc b/printing/print_settings_initializer.cc

index 7a0f0e3c20e88818c629f407f20eaadf5e93d712..8d9065dc7adbb3fbfdf617a1a81733dc0f5d1b0d 100644

--- a/printing/print_settings_initializer.cc

+++ b/printing/print_settings_initializer.cc

@@ -42,7 +42,7 @@ void PrintSettingsInitializer::InitHeaderFooterStrings(

}

gfx::Font font(

- UTF8ToUTF16(kSettingHeaderFooterFontName),

+ kSettingHeaderFooterFontName,

ceil(ConvertPointsToPixelDouble(kSettingHeaderFooterFontSize)));

double segment_width = GetHeaderFooterSegmentWidth(ConvertUnitDouble(

print_settings->page_setup_device_units().physical_size().width(),

« no previous file with comments | « chrome/common/badge_util.cc ('k') | ui/gfx/font.h » ('j') | ui/gfx/font.h » ('J')