Generalize printer color model handling, get rid of CUPS specific case. Enable supported paper szes…

chrome/browser/ui/webui/print_preview/print_preview_handler.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_WEBUI_PRINT_PREVIEW_PRINT_PREVIEW_HANDLER_H_
 #define CHROME_BROWSER_UI_WEBUI_PRINT_PREVIEW_PRINT_PREVIEW_HANDLER_H_
 
 #include <string>
 
 #include "base/files/file_path.h"
@@ skipping 81 matching lines @@
   virtual void OnPrivetPrintingError(
       const local_discovery::PrivetLocalPrintOperation* print_operation,
         int http_code) OVERRIDE;
 #endif  // ENABLE_SERVICE_DISCOVERY
   int regenerate_preview_request_count() const {
     return regenerate_preview_request_count_;
   }
 
  private:
   class AccessTokenService;
-  struct CUPSPrinterColorModels;
 
   static bool PrivetPrintingEnabled();
 
   content::WebContents* preview_web_contents() const;
 
   // Gets the list of printers. |args| is unused.
   void HandleGetPrinters(const base::ListValue* args);
 
   // Starts getting all local privet printers. |arg| is unused.
   void HandleGetPrivetPrinters(const base::ListValue* args);
@@ skipping 176 matching lines @@
   // Whether we have already logged the number of printers this session.
   bool has_logged_printers_count_;
 
   // Holds the path to the print to pdf request. It is empty if no such request
   // exists.
   base::FilePath print_to_pdf_path_;
 
   // Holds token service to get OAuth2 access tokens.
   scoped_ptr<AccessTokenService> token_service_;
 
-#if defined(USE_CUPS)
-  // The color capabilities from the last printer queried.
-  scoped_ptr<CUPSPrinterColorModels> cups_printer_color_models_;
-#endif
-
 #if defined(ENABLE_SERVICE_DISCOVERY)
   scoped_refptr<local_discovery::ServiceDiscoverySharedClient>
       service_discovery_client_;
   scoped_ptr<local_discovery::PrivetLocalPrinterLister> printer_lister_;
 
   scoped_ptr<local_discovery::PrivetHTTPAsynchronousFactory>
       privet_http_factory_;
   scoped_ptr<local_discovery::PrivetHTTPResolution> privet_http_resolution_;
   scoped_ptr<local_discovery::PrivetHTTPClient> privet_http_client_;
   scoped_ptr<local_discovery::PrivetJSONOperation>
       privet_capabilities_operation_;
   scoped_ptr<local_discovery::PrivetLocalPrintOperation>
       privet_local_print_operation_;
 #endif
 
   base::WeakPtrFactory<PrintPreviewHandler> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PrintPreviewHandler);
 };
 
 #endif  // CHROME_BROWSER_UI_WEBUI_PRINT_PREVIEW_PRINT_PREVIEW_HANDLER_H_