Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(345)

Unified Diff: printing/printing_context.cc

Issue 325313003: Add vendor id and custom display name to media selection (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address cl comments. Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « printing/print_settings_initializer.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: printing/printing_context.cc
diff --git a/printing/printing_context.cc b/printing/printing_context.cc
index 8d438d0594a1ae3b09c536c384ac10f7a7384ef1..c7cd644c2f7f0659227eeb9bee821546f1447847 100644
--- a/printing/printing_context.cc
+++ b/printing/printing_context.cc
@@ -96,19 +96,13 @@ PrintingContext::Result PrintingContext::UpdatePrintSettings(
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) {
« no previous file with comments | « printing/print_settings_initializer.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698