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

Unified Diff: chrome/browser/printing/printed_document.cc

Issue 113441: ChromeFont->gfx::Font... (Closed) Base URL: svn://chrome-svn.corp.google.com/chrome/trunk/src/
Patch Set: Created 11 years, 7 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/browser/printing/printed_document.h ('k') | chrome/browser/shell_dialogs.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/printing/printed_document.cc
===================================================================
--- chrome/browser/printing/printed_document.cc (revision 16106)
+++ chrome/browser/printing/printed_document.cc (working copy)
@@ -130,12 +130,12 @@
}
// Print the header and footer.
- int base_font_size = ChromeFont().height();
+ int base_font_size = gfx::Font().height();
int new_font_size = ConvertUnit(10,
immutable_.settings_.desired_dpi,
immutable_.settings_.dpi());
DCHECK_GT(new_font_size, base_font_size);
- ChromeFont font(ChromeFont().DeriveFont(new_font_size - base_font_size));
+ gfx::Font font(gfx::Font().DeriveFont(new_font_size - base_font_size));
HGDIOBJ old_font = SelectObject(context, font.hfont());
DCHECK(old_font != NULL);
// We don't want a white square around the text ever if overflowing.
@@ -264,7 +264,7 @@
const PrintedPage& page,
PageOverlays::HorizontalPosition x,
PageOverlays::VerticalPosition y,
- const ChromeFont& font) const {
+ const gfx::Font& font) const {
const PrintSettings& settings = immutable_.settings_;
const std::wstring& line = settings.overlays.GetOverlay(x, y);
if (line.empty()) {
« no previous file with comments | « chrome/browser/printing/printed_document.h ('k') | chrome/browser/shell_dialogs.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698