Index: printing/backend/print_backend_cups.cc |
=================================================================== |
--- printing/backend/print_backend_cups.cc (revision 153539) |
+++ printing/backend/print_backend_cups.cc (working copy) |
@@ -20,6 +20,8 @@ |
#include "base/lazy_instance.h" |
#include "base/logging.h" |
#include "base/string_number_conversions.h" |
+#include "base/string_split.h" |
Lei Zhang
2012/09/05 00:32:32
not sure why these got added here.
gene
2012/09/05 21:04:10
Good catch, thanks!
I initially moved ppd parsing
|
+#include "base/string_util.h" |
#include "base/synchronization/lock.h" |
#include "base/values.h" |
#include "googleurl/src/gurl.h" |
@@ -108,6 +110,9 @@ |
// PrintBackend implementation. |
virtual bool EnumeratePrinters(PrinterList* printer_list) OVERRIDE; |
virtual std::string GetDefaultPrinterName() OVERRIDE; |
+ virtual bool GetPrinterSemanticCapsAndDefaults( |
+ const std::string& printer_name, |
+ PrinterSemanticCapsAndDefaults* printer_info) OVERRIDE; |
virtual bool GetPrinterCapsAndDefaults( |
const std::string& printer_name, |
PrinterCapsAndDefaults* printer_info) OVERRIDE; |
@@ -210,6 +215,17 @@ |
return dest ? std::string(dest->name) : std::string(); |
} |
+bool PrintBackendCUPS::GetPrinterSemanticCapsAndDefaults( |
+ const std::string& printer_name, |
+ PrinterSemanticCapsAndDefaults* printer_info) { |
+ PrinterCapsAndDefaults info; |
+ if (!GetPrinterCapsAndDefaults(printer_name, &info) ) |
+ return false; |
+ |
+ return parsePpdCapabilities( |
+ printer_name, info.printer_capabilities, printer_info); |
+} |
+ |
bool PrintBackendCUPS::GetPrinterCapsAndDefaults( |
const std::string& printer_name, |
PrinterCapsAndDefaults* printer_info) { |