summaryrefslogtreecommitdiffstats
path: root/printing
diff options
context:
space:
mode:
authorvitalybuka@chromium.org <vitalybuka@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-01 14:25:01 +0000
committervitalybuka@chromium.org <vitalybuka@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-01 14:25:01 +0000
commit0c5e30258cc4e93f4feed88aad92e795ea9ffca4 (patch)
tree7895850a60743b4cd6b41be6533bde1ceef2f382 /printing
parent058308ca15ad07c9677fb9595938135897031e45 (diff)
downloadchromium_src-0c5e30258cc4e93f4feed88aad92e795ea9ffca4.zip
chromium_src-0c5e30258cc4e93f4feed88aad92e795ea9ffca4.tar.gz
chromium_src-0c5e30258cc4e93f4feed88aad92e795ea9ffca4.tar.bz2
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
Diffstat (limited to 'printing')
-rw-r--r--printing/printing_context.cc3
-rw-r--r--printing/printing_context_no_system_dialog.cc4
2 files changed, 4 insertions, 3 deletions
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;
}