Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(22)

Unified Diff: chrome/browser/ui/webui/print_preview_handler.h

Issue 8245012: Revert 105087 - PrintPreview: Fix printer color settings issues based on printer ppd/schema infor... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/print_preview_handler.h
===================================================================
--- chrome/browser/ui/webui/print_preview_handler.h (revision 105094)
+++ chrome/browser/ui/webui/print_preview_handler.h (working copy)
@@ -15,7 +15,6 @@
#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;
@@ -31,6 +30,21 @@
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>,
@@ -184,7 +198,7 @@
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.
« no previous file with comments | « chrome/browser/resources/print_preview/print_preview.js ('k') | chrome/browser/ui/webui/print_preview_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698