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, 4 insertions, 10 deletions

diff --git a/chromium/printing/print_settings_initializer_mac.cc b/chromium/printing/print_settings_initializer_mac.cc
index fd665989a59..7dc41a65703 100644
--- a/chromium/printing/print_settings_initializer_mac.cc
+++ b/chromium/printing/print_settings_initializer_mac.cc
@@ -6,6 +6,7 @@
 
 #include "base/strings/sys_string_conversions.h"
 #include "printing/print_settings.h"
+#include "printing/units.h"
 
 namespace printing {
 
@@ -13,21 +14,13 @@ namespace printing {
 void PrintSettingsInitializerMac::InitPrintSettings(
     PMPrinter printer,
     PMPageFormat page_format,
-    const PageRanges& new_ranges,
-    bool print_selection_only,
     PrintSettings* print_settings) {
-  DCHECK(print_settings);
-
-  print_settings->set_printer_name(
-      base::SysCFStringRefToUTF16(PMPrinterGetName(printer)));
   print_settings->set_device_name(
       base::SysCFStringRefToUTF16(PMPrinterGetID(printer)));
-  print_settings->ranges = new_ranges;
 
   PMOrientation orientation = kPMPortrait;
   PMGetOrientation(page_format, &orientation);
-  print_settings->set_landscape(orientation == kPMLandscape);
-  print_settings->selection_only = print_selection_only;
+  print_settings->SetOrientation(orientation == kPMLandscape);
 
   UInt32 resolution_count = 0;
   PMResolution best_resolution = { 72.0, 72.0 };
@@ -62,9 +55,10 @@ void PrintSettingsInitializerMac::InitPrintSettings(
       (page_rect.right - page_rect.left),
       (page_rect.bottom - page_rect.top));
 
+  DCHECK_EQ(print_settings->device_units_per_inch(), kPointsPerInch);
   print_settings->SetPrinterPrintableArea(physical_size_device_units,
                                           printable_area_device_units,
-                                          72);
+                                          false);
 }
 
 }  // namespace printing