From 0c5e30258cc4e93f4feed88aad92e795ea9ffca4 Mon Sep 17 00:00:00 2001 From: "vitalybuka@chromium.org" Date: Fri, 1 Nov 2013 14:25:01 +0000 Subject: Revert piece of "De-duplicate job_settings parsing code." r231501 UseDefaultSettingsis call is not necessary. Review URL: https://codereview.chromium.org/54273002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@232371 0039d316-1c4b-4281-b951-d872f2087c98 --- printing/printing_context.cc | 3 --- printing/printing_context_no_system_dialog.cc | 4 ++++ 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'printing') diff --git a/printing/printing_context.cc b/printing/printing_context.cc index edbcaa4..9b3b8ae 100644 --- a/printing/printing_context.cc +++ b/printing/printing_context.cc @@ -47,9 +47,6 @@ PrintingContext::Result PrintingContext::UpdatePrintSettings( const PageRanges& ranges) { ResetSettings(); - if (settings_.dpi() == 0) - UseDefaultSettings(); - if (!PrintSettingsInitializer::InitSettings(job_settings, ranges, &settings_)) { NOTREACHED(); diff --git a/printing/printing_context_no_system_dialog.cc b/printing/printing_context_no_system_dialog.cc index 7fd2cee..869620f 100644 --- a/printing/printing_context_no_system_dialog.cc +++ b/printing/printing_context_no_system_dialog.cc @@ -81,6 +81,10 @@ PrintingContext::Result PrintingContextNoSystemDialog::UseDefaultSettings() { PrintingContext::Result PrintingContextNoSystemDialog::UpdatePrinterSettings( bool target_is_pdf, bool external_preview) { + + if (settings_.dpi() == 0) + UseDefaultSettings(); + return OK; } -- cgit v1.1