Improvements in --debug-print switch implementation.

printing/printing_context.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "printing/printing_context.h"
 
 #include "base/logging.h"
 #include "base/values.h"
 #include "printing/page_setup.h"
 #include "printing/page_size_margins.h"
 #include "printing/print_job_constants.h"
-#include "printing/print_settings_initializer.h"
+#include "printing/print_settings_conversion.h"
 #include "printing/units.h"
 
 namespace printing {
 
 namespace {
 const float kCloudPrintMarginInch = 0.25;
 }
 
 PrintingContext::PrintingContext(const std::string& app_locale)
     : dialog_box_dismissed_(false),
@@ skipping 33 matching lines @@
   pdf_settings->SetInteger(kSettingMarginsType, printing::NO_MARGINS);
   pdf_settings->SetBoolean(kSettingCollate, true);
   pdf_settings->SetInteger(kSettingCopies, 1);
   pdf_settings->SetInteger(kSettingColor, printing::COLOR);
   pdf_settings->SetInteger(kSettingDuplexMode, printing::SIMPLEX);
   pdf_settings->SetBoolean(kSettingLandscape, false);
   pdf_settings->SetString(kSettingDeviceName, "");
   pdf_settings->SetBoolean(kSettingPrintToPDF, true);
   pdf_settings->SetBoolean(kSettingCloudPrintDialog, false);
   pdf_settings->SetBoolean(kSettingPrintWithPrivet, false);
-  return UpdatePrintSettings(*pdf_settings, PageRanges());
+  return UpdatePrintSettings(*pdf_settings);
 }
 
 PrintingContext::Result PrintingContext::UpdatePrintSettings(
-    const base::DictionaryValue& job_settings,
-    const PageRanges& ranges) {
+    const base::DictionaryValue& job_settings) {
   ResetSettings();
 
-  if (!PrintSettingsInitializer::InitSettings(job_settings, ranges,
-                                              &settings_)) {
+  if (!PrintSettingsFromJobSettings(job_settings, &settings_)) {
     NOTREACHED();
     return OnError();
   }
 
   bool print_to_pdf = false;
   bool is_cloud_dialog = false;
   bool print_with_privet = false;
 
   if (!job_settings.GetBoolean(kSettingPrintToPDF, &print_to_pdf) ||
       !job_settings.GetBoolean(kSettingCloudPrintDialog, &is_cloud_dialog) ||
       !job_settings.GetBoolean(kSettingPrintWithPrivet, &print_with_privet)) {
     NOTREACHED();
     return OnError();
   }
 
   bool print_to_cloud = job_settings.HasKey(kSettingCloudPrintId);
   bool open_in_external_preview =
       job_settings.HasKey(kSettingOpenPDFInPreview);
 
   if (!open_in_external_preview && (print_to_pdf || print_to_cloud ||
                                     is_cloud_dialog || print_with_privet)) {
     settings_.set_dpi(kDefaultPdfDpi);
     gfx::Size paper_size(GetPdfPaperSizeDeviceUnits());
     if (!settings_.requested_media().size_microns.IsEmpty()) {
       float deviceMicronsPerDeviceUnit =
           (kHundrethsMMPerInch * 10.0f) / settings_.device_units_per_inch();
       paper_size = gfx::Size(settings_.requested_media().size_microns.width() /
-                             deviceMicronsPerDeviceUnit,
+                                 deviceMicronsPerDeviceUnit,
                              settings_.requested_media().size_microns.height() /
-                             deviceMicronsPerDeviceUnit);
+                                 deviceMicronsPerDeviceUnit);
     }
     gfx::Rect paper_rect(0, 0, paper_size.width(), paper_size.height());
     if (print_to_cloud || print_with_privet) {
       paper_rect.Inset(
           kCloudPrintMarginInch * settings_.device_units_per_inch(),
           kCloudPrintMarginInch * settings_.device_units_per_inch());
     }
     settings_.SetPrinterPrintableArea(paper_size, paper_rect, true);
     return OK;
   }
 
   return UpdatePrinterSettings(open_in_external_preview);
 }
 
 }  // namespace printing