OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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, no traditional include guard. | 5 // Multiply-included message file, no traditional include guard. |
6 #include <string> | 6 #include <string> |
| 7 #include <vector> |
7 | 8 |
8 #include "chrome/common/cloud_print/cloud_print_proxy_info.h" | 9 #include "chrome/common/cloud_print/cloud_print_proxy_info.h" |
9 #include "ipc/ipc_channel_handle.h" | 10 #include "ipc/ipc_channel_handle.h" |
10 #include "ipc/ipc_message_macros.h" | 11 #include "ipc/ipc_message_macros.h" |
11 | 12 |
12 #define IPC_MESSAGE_START ServiceMsgStart | 13 #define IPC_MESSAGE_START ServiceMsgStart |
13 | 14 |
14 IPC_STRUCT_TRAITS_BEGIN(cloud_print::CloudPrintProxyInfo) | 15 IPC_STRUCT_TRAITS_BEGIN(cloud_print::CloudPrintProxyInfo) |
15 IPC_STRUCT_TRAITS_MEMBER(enabled) | 16 IPC_STRUCT_TRAITS_MEMBER(enabled) |
16 IPC_STRUCT_TRAITS_MEMBER(email) | 17 IPC_STRUCT_TRAITS_MEMBER(email) |
17 IPC_STRUCT_TRAITS_MEMBER(proxy_id) | 18 IPC_STRUCT_TRAITS_MEMBER(proxy_id) |
18 IPC_STRUCT_TRAITS_END() | 19 IPC_STRUCT_TRAITS_END() |
19 | 20 |
20 //----------------------------------------------------------------------------- | 21 //----------------------------------------------------------------------------- |
21 // Service process messages: | 22 // Service process messages: |
22 // These are messages from the browser to the service process. | 23 // These are messages from the browser to the service process. |
23 // Tell the service process to enable the cloud proxy passing in the lsid | 24 // Tell the service process to enable the cloud proxy passing in the lsid |
24 // of the account to be used. | 25 // of the account to be used. |
25 IPC_MESSAGE_CONTROL1(ServiceMsg_EnableCloudPrintProxy, | 26 IPC_MESSAGE_CONTROL1(ServiceMsg_EnableCloudPrintProxy, |
26 std::string /* lsid */) | 27 std::string /* lsid */) |
27 | 28 |
28 // Tell the service process to enable the cloud proxy passing in the OAuth2 | 29 // Tell the service process to enable the cloud proxy passing in the OAuth2 |
29 // auth code of a robot account. | 30 // auth code of a robot account. |
30 IPC_MESSAGE_CONTROL3(ServiceMsg_EnableCloudPrintProxyWithRobot, | 31 IPC_MESSAGE_CONTROL5(ServiceMsg_EnableCloudPrintProxyWithRobot, |
31 std::string /* robot_auth_code */, | 32 std::string /* robot_auth_code */, |
32 std::string /* robot_email*/, | 33 std::string /* robot_email */, |
33 std::string /* user_email*/) | 34 std::string /* user_email */, |
| 35 bool /* connect_new_printers */, |
| 36 std::vector<std::string> /* printer_blacklist */) |
34 | 37 |
35 // Tell the service process to disable the cloud proxy. | 38 // Tell the service process to disable the cloud proxy. |
36 IPC_MESSAGE_CONTROL0(ServiceMsg_DisableCloudPrintProxy) | 39 IPC_MESSAGE_CONTROL0(ServiceMsg_DisableCloudPrintProxy) |
37 | 40 |
38 // Requests a message back on the current status of the cloud print proxy | 41 // Requests a message back on the current status of the cloud print proxy |
39 // (whether it is enabled, the email address and the proxy id). | 42 // (whether it is enabled, the email address and the proxy id). |
40 IPC_MESSAGE_CONTROL0(ServiceMsg_GetCloudPrintProxyInfo) | 43 IPC_MESSAGE_CONTROL0(ServiceMsg_GetCloudPrintProxyInfo) |
41 | 44 |
42 // Tell the service process to shutdown. | 45 // Tell the service process to shutdown. |
43 IPC_MESSAGE_CONTROL0(ServiceMsg_Shutdown) | 46 IPC_MESSAGE_CONTROL0(ServiceMsg_Shutdown) |
44 | 47 |
45 // Tell the service process that an update is available. | 48 // Tell the service process that an update is available. |
46 IPC_MESSAGE_CONTROL0(ServiceMsg_UpdateAvailable) | 49 IPC_MESSAGE_CONTROL0(ServiceMsg_UpdateAvailable) |
47 | 50 |
48 //----------------------------------------------------------------------------- | 51 //----------------------------------------------------------------------------- |
49 // Service process host messages: | 52 // Service process host messages: |
50 // These are messages from the service process to the browser. | 53 // These are messages from the service process to the browser. |
51 // Sent when the cloud print proxy has an authentication error. | 54 // Sent when the cloud print proxy has an authentication error. |
52 IPC_MESSAGE_CONTROL0(ServiceHostMsg_CloudPrintProxy_AuthError) | 55 IPC_MESSAGE_CONTROL0(ServiceHostMsg_CloudPrintProxy_AuthError) |
53 | 56 |
54 // Sent as a response to a request for cloud print proxy info | 57 // Sent as a response to a request for cloud print proxy info |
55 IPC_MESSAGE_CONTROL1(ServiceHostMsg_CloudPrintProxy_Info, | 58 IPC_MESSAGE_CONTROL1(ServiceHostMsg_CloudPrintProxy_Info, |
56 cloud_print::CloudPrintProxyInfo /* proxy info */) | 59 cloud_print::CloudPrintProxyInfo /* proxy info */) |
OLD | NEW |