Add vendor id and custom display name to media selection

printing/printing_context.cc

 // 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.h"
 
 #include "base/logging.h"
 #include "base/values.h"
 #include "printing/page_setup.h"
 #include "printing/page_size_margins.h"
@@ skipping 78 matching lines @@
   }
 
   bool print_to_cloud = job_settings.HasKey(kSettingCloudPrintId);
   bool open_in_external_preview =
       job_settings.HasKey(kSettingOpenPDFInPreview);
 
   if (!open_in_external_preview && (print_to_pdf || print_to_cloud ||
                                     is_cloud_dialog || print_with_privet)) {
     settings_.set_dpi(kDefaultPdfDpi);
     gfx::Size paper_size(GetPdfPaperSizeDeviceUnits());
-    const base::DictionaryValue* media_size = NULL;
-    if (job_settings.GetDictionary(kSettingMediaSize, &media_size)) {
-      int width_microns = 0;
-      int height_microns = 0;
-      if (media_size->GetInteger(kSettingMediaSizeWidthMicrons,
-                                 &width_microns) &&
-          media_size->GetInteger(kSettingMediaSizeHeightMicrons,
-                                 &height_microns)) {
-        float deviceMicronsPerDeviceUnit =
-            (kHundrethsMMPerInch * 10.0f) / settings_.device_units_per_inch();
-        paper_size = gfx::Size(width_microns / deviceMicronsPerDeviceUnit,
-                               height_microns / deviceMicronsPerDeviceUnit);
-      }
+    if (!settings_.requested_media().size_microns.IsEmpty()) {
+      float deviceMicronsPerDeviceUnit =
+          (kHundrethsMMPerInch * 10.0f) / settings_.device_units_per_inch();
+      paper_size = gfx::Size(settings_.requested_media().size_microns.width() /
+                             deviceMicronsPerDeviceUnit,
+                             settings_.requested_media().size_microns.height() /
+                             deviceMicronsPerDeviceUnit);
     }
     gfx::Rect paper_rect(0, 0, paper_size.width(), paper_size.height());
     if (print_to_cloud || print_with_privet) {
       paper_rect.Inset(
           kCloudPrintMarginInch * settings_.device_units_per_inch(),
           kCloudPrintMarginInch * settings_.device_units_per_inch());
     }
     settings_.SetPrinterPrintableArea(paper_size, paper_rect, true);
     return OK;
   }
 
   return UpdatePrinterSettings(open_in_external_preview);
 }
 
 }  // namespace printing