Revert 105087 - PrintPreview: Fix printer color settings issues based on printer ppd/schema infor...

chrome/browser/ui/webui/print_preview_handler.h

 // Copyright (c) 2011 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_HANDLER_H_
 #define CHROME_BROWSER_UI_WEBUI_PRINT_PREVIEW_HANDLER_H_
 #pragma once
 
 #include <string>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "build/build_config.h"
 #include "chrome/browser/printing/print_view_manager_observer.h"
 #include "chrome/browser/ui/shell_dialogs.h"
 #include "content/browser/webui/web_ui.h"
-#include "printing/print_job_constants.h"
 
 class FilePath;
 class PrintSystemTaskProxy;
 class TabContentsWrapper;
 
 namespace base {
 class DictionaryValue;
 class FundamentalValue;
 class StringValue;
 }
 
 namespace printing {
 class PrintBackend;
 }
 
+#if defined(UNIT_TEST) && defined(USE_CUPS) && !defined(OS_MACOSX)
+typedef struct cups_option_s cups_option_t;
+
+namespace printing_internal {
+
+// Helper function to parse the lpoptions custom settings. |num_options| and
+// |options| will be updated if the custom settings for |printer_name| are
+// found, otherwise nothing is done.
+// NOTE: This function is declared here so it can be exposed for unit testing.
+void parse_lpoptions(const FilePath& filepath, const std::string& printer_name,
+                     int* num_options, cups_option_t** options);
+
+}  // namespace printing_internal
+#endif
+
 // The handler for Javascript messages related to the print preview dialog.
 class PrintPreviewHandler : public WebUIMessageHandler,
                             public base::SupportsWeakPtr<PrintPreviewHandler>,
                             public SelectFileDialog::Listener,
                             public printing::PrintViewManagerObserver {
  public:
   PrintPreviewHandler();
   virtual ~PrintPreviewHandler();
 
   // WebUIMessageHandler implementation.
@@ skipping 133 matching lines @@
 
   // Pointer to current print system.
   scoped_refptr<printing::PrintBackend> print_backend_;
 
   // The underlying dialog object.
   scoped_refptr<SelectFileDialog> select_file_dialog_;
 
   static FilePath* last_saved_path_;
   static std::string* last_used_printer_cloud_print_data_;
   static std::string* last_used_printer_name_;
-  static printing::ColorModels last_used_color_model_;
+  static bool last_used_color_setting_;
 
   // A count of how many requests received to regenerate preview data.
   // Initialized to 0 then incremented and emitted to a histogram.
   int regenerate_preview_request_count_;
 
   // A count of how many requests received to show manage printers dialog.
   int manage_printers_dialog_request_count_;
 
   // Whether we have already logged a failed print preview.
   bool reported_failed_preview_;
 
   // 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.
   scoped_ptr<FilePath> print_to_pdf_path_;
 
   DISALLOW_COPY_AND_ASSIGN(PrintPreviewHandler);
 };
 
 #endif  // CHROME_BROWSER_UI_WEBUI_PRINT_PREVIEW_HANDLER_H_