Get semantic capabilities from Print Backend.

printing/backend/print_backend_cups.cc

 // Copyright (c) 2012 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/backend/print_backend.h"
 
 #include "build/build_config.h"
 
 #include <dlfcn.h>
 #include <errno.h>
 #include <pthread.h>
 
 #if defined(OS_MACOSX)
 #include <AvailabilityMacros.h>
 #else
 #include <gcrypt.h>
 #endif
 
 #include "base/file_util.h"
 #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 code here, but then decided moving it to
cups_helper.cc

+#include "base/string_util.h"
 #include "base/synchronization/lock.h"
 #include "base/values.h"
 #include "googleurl/src/gurl.h"
 #include "printing/backend/cups_helper.h"
 #include "printing/backend/print_backend_consts.h"
 
 #if (defined(OS_MACOSX) && \
      MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_5) || \
     (defined(OS_LINUX) && \
      CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 4)
@@ skipping 68 matching lines @@
 static const char kCUPSPrinterMakeModelOpt[] = "printer-make-and-model";
 
 class PrintBackendCUPS : public PrintBackend {
  public:
   PrintBackendCUPS(const GURL& print_server_url,
                    http_encryption_t encryption, bool blocking);
 
   // 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;
   virtual std::string GetPrinterDriverInfo(
       const std::string& printer_name) OVERRIDE;
   virtual bool IsValidPrinter(const std::string& printer_name) OVERRIDE;
 
  protected:
   virtual ~PrintBackendCUPS() {}
 
@@ skipping 82 matching lines @@
 }
 
 std::string PrintBackendCUPS::GetDefaultPrinterName() {
   // Not using cupsGetDefault() because it lies about the default printer.
   cups_dest_t* dests;
   int num_dests = GetDests(&dests);
   cups_dest_t* dest = cupsGetDest(NULL, NULL, num_dests, dests);
   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) {
   DCHECK(printer_info);
 
   VLOG(1) << "CUPS: Getting caps and defaults"
           << ", printer name: " << printer_name;
 
   FilePath ppd_path(GetPPD(printer_name.c_str()));
   // In some cases CUPS failed to get ppd file.
@@ skipping 130 matching lines @@
                    << ", HTTP error: " << http_error;
         file_util::Delete(ppd_path, false);
         ppd_path.clear();
       }
     }
   }
   return ppd_path;
 }
 
 }  // namespace printing