Use DPI from Print Preview on Windows, handle non square

printing/print_settings_conversion.cc

 // Copyright 2014 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/print_settings_conversion.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <cmath>
@@ skipping 160 matching lines @@
   settings->set_ranges(new_ranges);
 
   int color = 0;
   bool landscape = false;
   int duplex_mode = 0;
   base::string16 device_name;
   bool collate = false;
   int copies = 1;
   int scale_factor = 100;
   bool rasterize_pdf = false;
+  int dpi_horizontal = 0;
+  int dpi_vertical = 0;
 
   if (!job_settings.GetBoolean(kSettingCollate, &collate) ||
       !job_settings.GetInteger(kSettingCopies, &copies) ||
       !job_settings.GetInteger(kSettingColor, &color) ||
       !job_settings.GetInteger(kSettingDuplexMode, &duplex_mode) ||
       !job_settings.GetBoolean(kSettingLandscape, &landscape) ||
       !job_settings.GetString(kSettingDeviceName, &device_name) ||
       !job_settings.GetInteger(kSettingScaleFactor, &scale_factor) ||
-      !job_settings.GetBoolean(kSettingRasterizePdf, &rasterize_pdf)) {
+      !job_settings.GetBoolean(kSettingRasterizePdf, &rasterize_pdf) ||
+      !job_settings.GetInteger(kSettingDpiHorizontal, &dpi_horizontal) ||
+      !job_settings.GetInteger(kSettingDpiVertical, &dpi_vertical)) {
     return false;
   }
 
   settings->set_collate(collate);
   settings->set_copies(copies);
   settings->SetOrientation(landscape);
   settings->set_device_name(device_name);
   settings->set_duplex_mode(static_cast<DuplexMode>(duplex_mode));
   settings->set_color(static_cast<ColorModel>(color));
   settings->set_scale_factor(static_cast<double>(scale_factor) / 100.0);
   settings->set_rasterize_pdf(rasterize_pdf);
+  settings->set_desired_dpi(dpi_horizontal, dpi_vertical);
 #if defined(OS_WIN)
   // Modifiable implies HTML and not other formats like PDF.
   bool can_modify = false;
   if (job_settings.GetBoolean(kSettingPreviewModifiable, &can_modify))
     settings->set_print_text_with_gdi(can_modify);
 #endif
 
   return true;
 }
 
@@ skipping 23 matching lines @@
   job_settings->SetInteger(kSettingCopies, settings.copies());
   job_settings->SetInteger(kSettingColor, settings.color());
   job_settings->SetInteger(kSettingDuplexMode, settings.duplex_mode());
   job_settings->SetBoolean(kSettingLandscape, settings.landscape());
   job_settings->SetString(kSettingDeviceName, settings.device_name());
 
   // Following values are not read form JSON by InitSettings, so do not have
   // common public constants. So just serialize in "debug" section.
   base::DictionaryValue* debug = new base::DictionaryValue;
   job_settings->Set("debug", debug);
-  debug->SetInteger("desiredDpi", settings.desired_dpi());
   debug->SetInteger("dpi", settings.dpi());
   debug->SetInteger("deviceUnitsPerInch", settings.device_units_per_inch());
   debug->SetBoolean("support_alpha_blend", settings.should_print_backgrounds());
   debug->SetString("media_vendor_od", settings.requested_media().vendor_id);
   SetSizeToJobSettings(
       "media_size", settings.requested_media().size_microns, debug);
   SetMarginsToJobSettings("requested_custom_margins_in_points",
                           settings.requested_custom_margins_in_points(),
                           debug);
   const PageSetup& page_setup = settings.page_setup_device_units();
   SetMarginsToJobSettings(
       "effective_margins", page_setup.effective_margins(), debug);
   SetSizeToJobSettings("physical_size", page_setup.physical_size(), debug);
   SetRectToJobSettings("overlay_area", page_setup.overlay_area(), debug);
   SetRectToJobSettings("content_area", page_setup.content_area(), debug);
   SetRectToJobSettings("printable_area", page_setup.printable_area(), debug);
 }
 
 }  // namespace printing