summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormaruel@google.com <maruel@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-11 21:25:07 +0000
committermaruel@google.com <maruel@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-11 21:25:07 +0000
commit74d9bac91768d44032797452e697819b2d1fdb5d (patch)
tree4c80614a0cae44a29aca08c97fcfba45b4a3794c
parentab324f2466599fb0042c0e2b3244b65abff10bfe (diff)
downloadchromium_src-74d9bac91768d44032797452e697819b2d1fdb5d.zip
chromium_src-74d9bac91768d44032797452e697819b2d1fdb5d.tar.gz
chromium_src-74d9bac91768d44032797452e697819b2d1fdb5d.tar.bz2
Two minor fixes. Fix the hard coded desired dpi and remove an unneeded include.
Review URL: http://codereview.chromium.org/1954 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2084 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/printing/printed_document.cc4
-rw-r--r--chrome/browser/printing/win_printing_context.cc1
2 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/printing/printed_document.cc b/chrome/browser/printing/printed_document.cc
index 6d0a9f0..1b61971 100644
--- a/chrome/browser/printing/printed_document.cc
+++ b/chrome/browser/printing/printed_document.cc
@@ -129,7 +129,9 @@ void PrintedDocument::RenderPrintedPage(const PrintedPage& page,
// Print the header and footer.
int base_font_size = ChromeFont().height();
- int new_font_size = ConvertUnit(10, 72, immutable_.settings_.dpi());
+ 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));
HGDIOBJ old_font = SelectObject(context, font.hfont());
diff --git a/chrome/browser/printing/win_printing_context.cc b/chrome/browser/printing/win_printing_context.cc
index 3fff471..dc1723a 100644
--- a/chrome/browser/printing/win_printing_context.cc
+++ b/chrome/browser/printing/win_printing_context.cc
@@ -11,7 +11,6 @@
#include "base/time_format.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/printing/print_job_manager.h"
-#include "chrome/common/gfx/emf.h"
namespace {