Change print settings dpi from array to gfx::Size

Bug: None
Change-Id: Icd11e38860cf3eee024ebdf3fb847a528e8050c8
Reviewed-on: https://chromium-review.googlesource.com/843016Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Rebekah Potter <rbpotter@chromium.org>
Cr-Commit-Position: refs/heads/master@{#527088}

printing/print_settings.cc

@@ -171,8 +171,7 @@ void PrintSettings::Clear() {
   device_name_.clear();
   requested_media_ = RequestedMedia();
   page_setup_device_units_.Clear();
-  dpi_[0] = 0;
-  dpi_[1] = 0;
+  dpi_ = gfx::Size();
   scale_factor_ = 1.0f;
   rasterize_pdf_ = false;
   landscape_ = false;

printing/print_settings.h

@@ -14,6 +14,7 @@
 #include "printing/print_job_constants.h"
 #include "printing/printing_export.h"
 #include "ui/gfx/geometry/rect.h"
+#include "ui/gfx/geometry/size.h"
 
 namespace printing {
 
@@ -101,17 +102,14 @@ class PRINTING_EXPORT PrintSettings {
   }
   const base::string16& device_name() const { return device_name_; }
 
-  void set_dpi(int dpi) {
-    dpi_[0] = dpi;
-    dpi_[1] = dpi;
-  }
+  void set_dpi(int dpi) { dpi_ = gfx::Size(dpi, dpi); }
   void set_dpi_xy(int dpi_horizontal, int dpi_vertical) {
-    dpi_[0] = dpi_horizontal;
-    dpi_[1] = dpi_vertical;
+    dpi_ = gfx::Size(dpi_horizontal, dpi_vertical);
   }
-  int dpi() const { return std::max(dpi_[0], dpi_[1]); }
-  int dpi_horizontal() const { return dpi_[0]; }
-  int dpi_vertical() const { return dpi_[1]; }
+
+  int dpi() const { return std::max(dpi_.width(), dpi_.height()); }
+  int dpi_horizontal() const { return dpi_.width(); }
+  int dpi_vertical() const { return dpi_.height(); }
 
   void set_scale_factor(double scale_factor) { scale_factor_ = scale_factor; }
   double scale_factor() const { return scale_factor_; }
@@ -238,7 +236,7 @@ class PRINTING_EXPORT PrintSettings {
   // Printer's device effective dots per inch in both axes. The two values will
   // generally be identical. However, on Windows, there are a few rare printers
   // that support resolutions with different DPI in different dimensions.
-  int dpi_[2];
+  gfx::Size dpi_;
 
   // Scale factor
   double scale_factor_;