| Index: chromeos/printing/printer_configuration.h
|
| diff --git a/chromeos/printing/printer_configuration.h b/chromeos/printing/printer_configuration.h
|
| index 52237535d10c29ce417e820ec6e86aad9e83c0d2..e139372f8d99927e86df9484899cf4a5fa872087 100644
|
| --- a/chromeos/printing/printer_configuration.h
|
| +++ b/chromeos/printing/printer_configuration.h
|
| @@ -20,26 +20,19 @@ class CHROMEOS_EXPORT Printer {
|
| // If you add fields to this struct, you almost certainly will
|
| // want to update PpdResolver and PpdCache::GetCachePath.
|
| //
|
| + // Exactly one of the fields below should be filled in.
|
| + //
|
| // At resolution time, we look for a cached PPD that used the same
|
| // PpdReference before.
|
| //
|
| - // If one is not found and user_supplied_ppd_url is set, we'll fail
|
| - // out with NOT FOUND
|
| - //
|
| - // Otherwise, we'll hit QuirksServer to see if we can resolve a Ppd
|
| - // using manufacturer/model
|
| struct PpdReference {
|
| // If non-empty, this is the url of a specific PPD the user has specified
|
| - // for use with this printer.
|
| + // for use with this printer. The ppd can be gzipped or uncompressed.
|
| std::string user_supplied_ppd_url;
|
|
|
| - // The *effective* manufacturer and model of this printer, in other words,
|
| - // the manufacturer and model of the printer for which we grab a PPD. This
|
| - // doesn’t have to (but can) be the actual manufacturer/model of the
|
| - // printer. We should always try to fill these fields in, even if we don’t
|
| - // think they’ll be needed, as they provide a fallback mechanism for
|
| - // finding a PPD.
|
| - std::string effective_manufacturer;
|
| + // The *effective* model of this printer, in other words, the model of the
|
| + // printer for which we grab a PPD. This doesn’t have to (but can) be the
|
| + // actual model of the printer.
|
| std::string effective_model;
|
| };
|
|
|
|
|