Move settings setup for PDF and cloud print into single location in PrintingContext

printing/printing_context_mac.mm

 // 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_mac.h"
 
 #import <ApplicationServices/ApplicationServices.h>
 #import <AppKit/AppKit.h>
 
 #import <iomanip>
 #import <numeric>
 
 #include "base/logging.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "base/mac/scoped_nsautorelease_pool.h"
 #include "base/mac/scoped_nsexception_enabler.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "printing/print_settings_initializer_mac.h"
+#include "printing/units.h"
 
 namespace printing {
 
 namespace {
 
 // Return true if PPD name of paper is equal.
 bool IsPaperNameEqual(const PMPaper& paper1, const PMPaper& paper2) {
   CFStringRef name1 = NULL;
   CFStringRef name2 = NULL;
   return (PMPaperGetPPDPaperName(paper1, &name1) == noErr) &&
@@ skipping 68 matching lines @@
   if (selection == NSOKButton) {
     print_info_.reset([[panel printInfo] retain]);
     settings_.set_ranges(GetPageRangesFromPrintInfo());
     InitPrintSettingsFromPrintInfo();
     callback.Run(OK);
   } else {
     callback.Run(CANCEL);
   }
 }
 
+gfx::Size PrintingContextMac::GetPdfPaperSizeDeviceUnits() {
+  // NOTE: Reset |print_info_| with a copy of |sharedPrintInfo| so as to start
+  // with a clean slate.
+  print_info_.reset([[NSPrintInfo sharedPrintInfo] copy]);
+  UpdatePageFormatWithPaperInfo();
+
+  PMPageFormat page_format =
+      static_cast<PMPageFormat>([print_info_.get() PMPageFormat]);
+  PMRect paper_rect;
+  PMGetAdjustedPaperRect(page_format, &paper_rect);
+
+  // Device units are in points. Units per inch is 72.
+  gfx::Size physical_size_device_units(
+      (paper_rect.right - paper_rect.left),
+      (paper_rect.bottom - paper_rect.top));
+  DCHECK(settings_.device_units_per_inch() == kPointsPerInch);

[Lei Zhang, 2013/11/01 18:27:13]

nit: DCHECK_EQ

[Vitaly Buka (NO REVIEWS), 2013/11/01 19:46:29]

Done.

+  return physical_size_device_units;
+}
+
 PrintingContext::Result PrintingContextMac::UseDefaultSettings() {
   DCHECK(!in_print_job_);
 
   print_info_.reset([[NSPrintInfo sharedPrintInfo] copy]);
   settings_.set_ranges(GetPageRangesFromPrintInfo());
   InitPrintSettingsFromPrintInfo();
 
   return OK;
 }
 
 PrintingContext::Result PrintingContextMac::UpdatePrinterSettings(
-    bool target_is_pdf,
     bool external_preview) {
   DCHECK(!in_print_job_);
 
   // NOTE: Reset |print_info_| with a copy of |sharedPrintInfo| so as to start
   // with a clean slate.
   print_info_.reset([[NSPrintInfo sharedPrintInfo] copy]);
 
-  if (!target_is_pdf) {
+  if (external_preview) {
+    if (!SetPrintPreviewJob())
+      return OnError();
+  } else {
+    // Don't need this for preview.
     if (!SetPrinter(UTF16ToUTF8(settings_.device_name())) ||
         !SetCopiesInPrintSettings(settings_.copies()) ||
         !SetCollateInPrintSettings(settings_.collate()) ||
         !SetDuplexModeInPrintSettings(settings_.duplex_mode()) ||
         !SetOutputColor(settings_.color())) {
       return OnError();
     }
   }
 
-  if ((external_preview && !SetPrintPreviewJob()) ||
-      !UpdatePageFormatWithPaperInfo() ||
+  if (!UpdatePageFormatWithPaperInfo() ||
       !SetOrientationIsLandscape(settings_.landscape())) {
     return OnError();
   }
 
   [print_info_.get() updateFromPMPrintSettings];
 
   InitPrintSettingsFromPrintInfo();
   return OK;
 }
 
@@ skipping 328 matching lines @@
 void PrintingContextMac::ReleaseContext() {
   print_info_.reset();
   context_ = NULL;
 }
 
 gfx::NativeDrawingContext PrintingContextMac::context() const {
   return context_;
 }
 
 }  // namespace printing