Update to new stable branch 1750

This also includes an updated ninja and chromium dependencies
needed on Windows.

Change-Id: Icd597d80ed3fa4425933c9f1334c3c2e31291c42
Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu>
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>

1 files changed, 3 insertions, 11 deletions

diff --git a/chromium/printing/print_settings_initializer_win.cc b/chromium/printing/print_settings_initializer_win.cc
index 0ec96d0ab62..c10562b86c5 100644
--- a/chromium/printing/print_settings_initializer_win.cc
+++ b/chromium/printing/print_settings_initializer_win.cc
@@ -14,18 +14,10 @@ namespace printing {
 void PrintSettingsInitializerWin::InitPrintSettings(
     HDC hdc,
     const DEVMODE& dev_mode,
-    const PageRanges& new_ranges,
-    const std::wstring& new_device_name,
-    bool print_selection_only,
     PrintSettings* print_settings) {
   DCHECK(hdc);
   DCHECK(print_settings);
-
-  print_settings->set_printer_name(dev_mode.dmDeviceName);
-  print_settings->set_device_name(new_device_name);
-  print_settings->ranges = const_cast<PageRanges&>(new_ranges);
-  print_settings->set_landscape(dev_mode.dmOrientation == DMORIENT_LANDSCAPE);
-  print_settings->selection_only = print_selection_only;
+  print_settings->SetOrientation(dev_mode.dmOrientation == DMORIENT_LANDSCAPE);
 
   int dpi = GetDeviceCaps(hdc, LOGPIXELSX);
   print_settings->set_dpi(dpi);
@@ -56,10 +48,10 @@ void PrintSettingsInitializerWin::InitPrintSettings(
           printable_area_device_units)) {
     printable_area_device_units = gfx::Rect(physical_size_device_units);
   }
-
+  DCHECK_EQ(print_settings->device_units_per_inch(), dpi);
   print_settings->SetPrinterPrintableArea(physical_size_device_units,
                                           printable_area_device_units,
-                                          dpi);
+                                          false);
 }
 
 }  // namespace printing