chrome/common/chrome_utility_messages.h - Issue 321703002: Revert of Generalize printer color model handling, get rid of CUPS specific case. Enable supported paper szes…

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/common/chrome_utility_messages.h

Issue 321703002: Revert of Generalize printer color model handling, get rid of CUPS specific case. Enable supported paper szes… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 6 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

« no previous file with comments | « chrome/browser/ui/webui/print_preview/print_preview_handler.cc ('k') | chrome/common/cloud_print/cloud_print_cdd_conversion.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/common/chrome_utility_messages.h

diff --git a/chrome/common/chrome_utility_messages.h b/chrome/common/chrome_utility_messages.h

index b706ee545cf0ea7edc3b6b0f6cc3c725178e7d85..a926690b948cb0465cfb425c58cba8d85ada8673 100644

--- a/chrome/common/chrome_utility_messages.h

+++ b/chrome/common/chrome_utility_messages.h

@@ -48,13 +48,14 @@

IPC_STRUCT_TRAITS_MEMBER(defaults_mime_type)

IPC_STRUCT_TRAITS_END()

-IPC_ENUM_TRAITS_MAX_VALUE(printing::ColorModel, printing::PROCESSCOLORMODEL_RGB)

-IPC_ENUM_TRAITS_MAX_VALUE(printing::DuplexMode, printing::SHORT_EDGE)

+IPC_ENUM_TRAITS(printing::DuplexMode)

+#if defined(OS_WIN)

IPC_STRUCT_TRAITS_BEGIN(printing::PrinterSemanticCapsAndDefaults::Paper)

IPC_STRUCT_TRAITS_MEMBER(name)

IPC_STRUCT_TRAITS_MEMBER(size_um)

IPC_STRUCT_TRAITS_END()

+#endif

IPC_STRUCT_TRAITS_BEGIN(printing::PrinterSemanticCapsAndDefaults)

IPC_STRUCT_TRAITS_MEMBER(collate_capable)

@@ -64,12 +65,16 @@

IPC_STRUCT_TRAITS_MEMBER(duplex_default)

IPC_STRUCT_TRAITS_MEMBER(color_changeable)

IPC_STRUCT_TRAITS_MEMBER(color_default)

+#if defined(USE_CUPS)

IPC_STRUCT_TRAITS_MEMBER(color_model)

IPC_STRUCT_TRAITS_MEMBER(bw_model)

+#endif

+#if defined(OS_WIN)

IPC_STRUCT_TRAITS_MEMBER(papers)

IPC_STRUCT_TRAITS_MEMBER(default_paper)

IPC_STRUCT_TRAITS_MEMBER(dpis)

IPC_STRUCT_TRAITS_MEMBER(default_dpi)

+#endif

IPC_STRUCT_TRAITS_END()

IPC_ENUM_TRAITS(printing::PwgRasterTransformType);