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

Side by Side Diff: trunk/src/chrome/common/chrome_utility_messages.h

Issue 319373004: Revert 275646 "Generalize printer color model handling, get rid ..." (Closed) Base URL: svn://svn.chromium.org/chrome/
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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // Multiply-included message file, so no include guard. 5 // Multiply-included message file, so no include guard.
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 30 matching lines...) Expand all
41 IPC_STRUCT_TRAITS_MEMBER(to) 41 IPC_STRUCT_TRAITS_MEMBER(to)
42 IPC_STRUCT_TRAITS_END() 42 IPC_STRUCT_TRAITS_END()
43 43
44 IPC_STRUCT_TRAITS_BEGIN(printing::PrinterCapsAndDefaults) 44 IPC_STRUCT_TRAITS_BEGIN(printing::PrinterCapsAndDefaults)
45 IPC_STRUCT_TRAITS_MEMBER(printer_capabilities) 45 IPC_STRUCT_TRAITS_MEMBER(printer_capabilities)
46 IPC_STRUCT_TRAITS_MEMBER(caps_mime_type) 46 IPC_STRUCT_TRAITS_MEMBER(caps_mime_type)
47 IPC_STRUCT_TRAITS_MEMBER(printer_defaults) 47 IPC_STRUCT_TRAITS_MEMBER(printer_defaults)
48 IPC_STRUCT_TRAITS_MEMBER(defaults_mime_type) 48 IPC_STRUCT_TRAITS_MEMBER(defaults_mime_type)
49 IPC_STRUCT_TRAITS_END() 49 IPC_STRUCT_TRAITS_END()
50 50
51 IPC_ENUM_TRAITS_MAX_VALUE(printing::ColorModel, printing::PROCESSCOLORMODEL_RGB) 51 IPC_ENUM_TRAITS(printing::DuplexMode)
52 IPC_ENUM_TRAITS_MAX_VALUE(printing::DuplexMode, printing::SHORT_EDGE)
53 52
53 #if defined(OS_WIN)
54 IPC_STRUCT_TRAITS_BEGIN(printing::PrinterSemanticCapsAndDefaults::Paper) 54 IPC_STRUCT_TRAITS_BEGIN(printing::PrinterSemanticCapsAndDefaults::Paper)
55 IPC_STRUCT_TRAITS_MEMBER(name) 55 IPC_STRUCT_TRAITS_MEMBER(name)
56 IPC_STRUCT_TRAITS_MEMBER(size_um) 56 IPC_STRUCT_TRAITS_MEMBER(size_um)
57 IPC_STRUCT_TRAITS_END() 57 IPC_STRUCT_TRAITS_END()
58 #endif
58 59
59 IPC_STRUCT_TRAITS_BEGIN(printing::PrinterSemanticCapsAndDefaults) 60 IPC_STRUCT_TRAITS_BEGIN(printing::PrinterSemanticCapsAndDefaults)
60 IPC_STRUCT_TRAITS_MEMBER(collate_capable) 61 IPC_STRUCT_TRAITS_MEMBER(collate_capable)
61 IPC_STRUCT_TRAITS_MEMBER(collate_default) 62 IPC_STRUCT_TRAITS_MEMBER(collate_default)
62 IPC_STRUCT_TRAITS_MEMBER(copies_capable) 63 IPC_STRUCT_TRAITS_MEMBER(copies_capable)
63 IPC_STRUCT_TRAITS_MEMBER(duplex_capable) 64 IPC_STRUCT_TRAITS_MEMBER(duplex_capable)
64 IPC_STRUCT_TRAITS_MEMBER(duplex_default) 65 IPC_STRUCT_TRAITS_MEMBER(duplex_default)
65 IPC_STRUCT_TRAITS_MEMBER(color_changeable) 66 IPC_STRUCT_TRAITS_MEMBER(color_changeable)
66 IPC_STRUCT_TRAITS_MEMBER(color_default) 67 IPC_STRUCT_TRAITS_MEMBER(color_default)
68 #if defined(USE_CUPS)
67 IPC_STRUCT_TRAITS_MEMBER(color_model) 69 IPC_STRUCT_TRAITS_MEMBER(color_model)
68 IPC_STRUCT_TRAITS_MEMBER(bw_model) 70 IPC_STRUCT_TRAITS_MEMBER(bw_model)
71 #endif
72 #if defined(OS_WIN)
69 IPC_STRUCT_TRAITS_MEMBER(papers) 73 IPC_STRUCT_TRAITS_MEMBER(papers)
70 IPC_STRUCT_TRAITS_MEMBER(default_paper) 74 IPC_STRUCT_TRAITS_MEMBER(default_paper)
71 IPC_STRUCT_TRAITS_MEMBER(dpis) 75 IPC_STRUCT_TRAITS_MEMBER(dpis)
72 IPC_STRUCT_TRAITS_MEMBER(default_dpi) 76 IPC_STRUCT_TRAITS_MEMBER(default_dpi)
77 #endif
73 IPC_STRUCT_TRAITS_END() 78 IPC_STRUCT_TRAITS_END()
74 79
75 IPC_ENUM_TRAITS(printing::PwgRasterTransformType); 80 IPC_ENUM_TRAITS(printing::PwgRasterTransformType);
76 81
77 IPC_STRUCT_TRAITS_BEGIN(printing::PwgRasterSettings) 82 IPC_STRUCT_TRAITS_BEGIN(printing::PwgRasterSettings)
78 IPC_STRUCT_TRAITS_MEMBER(odd_page_transform) 83 IPC_STRUCT_TRAITS_MEMBER(odd_page_transform)
79 IPC_STRUCT_TRAITS_MEMBER(rotate_all_pages) 84 IPC_STRUCT_TRAITS_MEMBER(rotate_all_pages)
80 IPC_STRUCT_TRAITS_MEMBER(reverse_page_order) 85 IPC_STRUCT_TRAITS_MEMBER(reverse_page_order)
81 IPC_STRUCT_TRAITS_END() 86 IPC_STRUCT_TRAITS_END()
82 87
(...skipping 435 matching lines...) Expand 10 before | Expand all | Expand 10 after
518 IPC_MESSAGE_CONTROL2(ChromeUtilityHostMsg_GetAndEncryptWiFiCredentials, 523 IPC_MESSAGE_CONTROL2(ChromeUtilityHostMsg_GetAndEncryptWiFiCredentials,
519 std::string /* ssid */, 524 std::string /* ssid */,
520 std::vector<uint8> /* public_key */) 525 std::vector<uint8> /* public_key */)
521 526
522 // Reply after getting WiFi credentials from the system and encrypting them with 527 // Reply after getting WiFi credentials from the system and encrypting them with
523 // caller's public key. |success| is false if error occurred. 528 // caller's public key. |success| is false if error occurred.
524 IPC_MESSAGE_CONTROL2(ChromeUtilityHostMsg_GotEncryptedWiFiCredentials, 529 IPC_MESSAGE_CONTROL2(ChromeUtilityHostMsg_GotEncryptedWiFiCredentials,
525 std::vector<uint8> /* encrypted_key_data */, 530 std::vector<uint8> /* encrypted_key_data */,
526 bool /* success */) 531 bool /* success */)
527 #endif // defined(OS_WIN) 532 #endif // defined(OS_WIN)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698