OLD | NEW |
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 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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_MAX_VALUE(printing::ColorModel, printing::PROCESSCOLORMODEL_RGB) |
52 IPC_ENUM_TRAITS_MAX_VALUE(printing::DuplexMode, printing::SHORT_EDGE) | 52 IPC_ENUM_TRAITS_MAX_VALUE(printing::DuplexMode, printing::SHORT_EDGE) |
53 | 53 |
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(display_name) |
| 56 IPC_STRUCT_TRAITS_MEMBER(vendor_id) |
56 IPC_STRUCT_TRAITS_MEMBER(size_um) | 57 IPC_STRUCT_TRAITS_MEMBER(size_um) |
57 IPC_STRUCT_TRAITS_END() | 58 IPC_STRUCT_TRAITS_END() |
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) |
(...skipping 452 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
518 IPC_MESSAGE_CONTROL2(ChromeUtilityHostMsg_GetAndEncryptWiFiCredentials, | 519 IPC_MESSAGE_CONTROL2(ChromeUtilityHostMsg_GetAndEncryptWiFiCredentials, |
519 std::string /* ssid */, | 520 std::string /* ssid */, |
520 std::vector<uint8> /* public_key */) | 521 std::vector<uint8> /* public_key */) |
521 | 522 |
522 // Reply after getting WiFi credentials from the system and encrypting them with | 523 // Reply after getting WiFi credentials from the system and encrypting them with |
523 // caller's public key. |success| is false if error occurred. | 524 // caller's public key. |success| is false if error occurred. |
524 IPC_MESSAGE_CONTROL2(ChromeUtilityHostMsg_GotEncryptedWiFiCredentials, | 525 IPC_MESSAGE_CONTROL2(ChromeUtilityHostMsg_GotEncryptedWiFiCredentials, |
525 std::vector<uint8> /* encrypted_key_data */, | 526 std::vector<uint8> /* encrypted_key_data */, |
526 bool /* success */) | 527 bool /* success */) |
527 #endif // defined(OS_WIN) | 528 #endif // defined(OS_WIN) |
OLD | NEW |