diff options
| author | vitalybuka@chromium.org <vitalybuka@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-08 22:45:36 +0000 |
|---|---|---|
| committer | vitalybuka@chromium.org <vitalybuka@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-08 22:45:36 +0000 |
| commit | 54d416209283d95d43355d92794a165c37d77299 (patch) | |
| tree | bf30b15522703962fa481ca24dca75170faf1bc3 /cloud_print | |
| parent | d5418e010bb61224d2f2dd1d651755630a71db87 (diff) | |
| download | chromium_src-54d416209283d95d43355d92794a165c37d77299.zip chromium_src-54d416209283d95d43355d92794a165c37d77299.tar.gz chromium_src-54d416209283d95d43355d92794a165c37d77299.tar.bz2 | |
Fixed CDD.
"custom_display_name" must be set only if the "name" field is CUSTOM.
Removed optional values.
Review URL: https://codereview.chromium.org/108253004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@239417 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cloud_print')
| -rw-r--r-- | cloud_print/gcp20/prototype/printer.cc | 39 |
1 files changed, 4 insertions, 35 deletions
diff --git a/cloud_print/gcp20/prototype/printer.cc b/cloud_print/gcp20/prototype/printer.cc index 66dc69e..d9c00b7 100644 --- a/cloud_print/gcp20/prototype/printer.cc +++ b/cloud_print/gcp20/prototype/printer.cc @@ -68,53 +68,23 @@ const char kCdd[] = " 'option': [" " {" " 'is_default': true," -" 'type': 'STANDARD_COLOR'," -" 'vendor_id': 'CMYK'" +" 'type': 'STANDARD_COLOR'" " }," " {" -" 'is_default': false," -" 'type': 'STANDARD_MONOCHROME'," -" 'vendor_id': 'Gray'" +" 'type': 'STANDARD_MONOCHROME'" " }" " ]" " }," -" 'dpi': {" -" 'option': [ {" -" 'horizontal_dpi': 300," -" 'is_default': true," -" 'vertical_dpi': 300" -" }, {" -" 'horizontal_dpi': 600," -" 'is_default': false," -" 'vertical_dpi': 600" -" } ]" -" }," -" 'duplex': {" -" 'option': [ {" -" 'is_default': true," -" 'type': 'NO_DUPLEX'" -" }, {" -" 'is_default': false," -" 'type': 'SHORT_EDGE'" -" }, {" -" 'is_default': false," -" 'type': 'LONG_EDGE'" -" } ]" -" }," " 'media_size': {" " 'option': [ {" -" 'custom_display_name': 'A4'," " 'height_microns': 297000," -" 'is_continuous_feed': false," -" 'is_default': false," -" 'name': 'A4'," +" 'name': 'ISO_A4'," " 'width_microns': 210000" " }, {" " 'custom_display_name': 'Letter'," " 'height_microns': 279400," -" 'is_continuous_feed': false," " 'is_default': true," -" 'name': 'LETTER'," +" 'name': 'NA_LETTER'," " 'width_microns': 215900" " } ]" " }," @@ -123,7 +93,6 @@ const char kCdd[] = " 'is_default': true," " 'type': 'PORTRAIT'" " }, {" -" 'is_default': false," " 'type': 'LANDSCAPE'" " } ]" " }," |