Simplify code in PrintSettings.  Removes support for settings margins
etc in metric units but I will add again if required.  This is to prepare
adding user defined print settings.
Also fixes some typos in printing code.

Review URL: http://codereview.chromium.org/56077

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12856 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/printing/print_settings.h b/chrome/browser/printing/print_settings.h
index 48a39e64..da65cb3 100644
--- a/chrome/browser/printing/print_settings.h
+++ b/chrome/browser/printing/print_settings.h
@@ -33,11 +33,9 @@
             const std::wstring& new_device_name);
 #endif
 
-  // Sets margins in 0.01 millimeter unit.
-  void UpdateMarginsMetric(const PageMargins& new_margins);
-
-  // Sets margins in thousandth of inch.
-  void UpdateMarginsMilliInch(const PageMargins& new_margins);
+  // Set printer printable area in in pixels.
+  void SetPrinterPrintableArea(gfx::Size const& physical_size_pixels,
+                               gfx::Rect const& printable_area_pixels);
 
   // Initializes the print parameters that needs to be sent to the renderer
   // process.
@@ -54,11 +52,10 @@
   }
   const std::wstring& device_name() const { return device_name_; }
   int dpi() const { return dpi_; }
-  const PageSetup& page_setup_cmm() const { return page_setup_cmm_; }
   const PageSetup& page_setup_pixels() const { return page_setup_pixels_; }
 
-  // Multipage printing. Each PageRange describes a from-to page combinaison.
-  // This permits printing some selected pages only.
+  // Multi-page printing. Each PageRange describes a from-to page combination.
+  // This permits printing selected pages only.
   PageRanges ranges;
 
   // By imaging to a width a little wider than the available pixels, thin pages
@@ -96,9 +93,6 @@
   // Printer device name as opened by the OS.
   std::wstring device_name_;
 
-  // Page setup in centimillimeter (0.01 mm) units.
-  PageSetup page_setup_cmm_;
-
   // Page setup in pixel units, dpi adjusted.
   PageSetup page_setup_pixels_;