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

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: Add 'UTF-8' everywhere in the comments 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/common/badge_util.cc ('k') | ui/gfx/font.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698