Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 // Defines local discovery messages between the browser and utility process. | 5 // Defines local discovery messages between the browser and utility process. |
| 6 | 6 |
| 7 // Multiple-included file, no traditional include guard. | |
| 7 #include <vector> | 8 #include <vector> |
| 8 | 9 |
| 9 #include "base/file_descriptor_posix.h" | |
| 10 #include "chrome/common/local_discovery/service_discovery_client.h" | 10 #include "chrome/common/local_discovery/service_discovery_client.h" |
| 11 #include "ipc/ipc_message_macros.h" | 11 #include "ipc/ipc_message_macros.h" |
| 12 | 12 |
| 13 #ifndef CHROME_COMMON_LOCAL_DISCOVERY_LOCAL_DISCOVERY_MESSAGES_H_ | 13 #ifndef CHROME_COMMON_LOCAL_DISCOVERY_LOCAL_DISCOVERY_MESSAGES_H_ |
| 14 #define CHROME_COMMON_LOCAL_DISCOVERY_LOCAL_DISCOVERY_MESSAGES_H_ | 14 #define CHROME_COMMON_LOCAL_DISCOVERY_LOCAL_DISCOVERY_MESSAGES_H_ |
| 15 | 15 |
| 16 #if defined(OS_POSIX) | 16 #if defined(OS_POSIX) |
| 17 #include "base/file_descriptor_posix.h" | |
| 18 #endif | |
| 19 | |
|
Tom Sepez
2014/03/12 23:02:16
nit: two ifdef posix blocks back-to-back can be co
rvargas (doing something else)
2014/03/12 23:22:00
Right. I though about that but it feels wrong to m
| |
| 20 #if defined(OS_POSIX) | |
| 17 struct LocalDiscoveryMsg_SocketInfo { | 21 struct LocalDiscoveryMsg_SocketInfo { |
| 18 LocalDiscoveryMsg_SocketInfo() | 22 LocalDiscoveryMsg_SocketInfo() |
| 19 : address_family(net::ADDRESS_FAMILY_UNSPECIFIED), | 23 : address_family(net::ADDRESS_FAMILY_UNSPECIFIED), |
| 20 interface_index(0) { | 24 interface_index(0) { |
| 21 } | 25 } |
| 22 | 26 |
| 23 base::FileDescriptor descriptor; | 27 base::FileDescriptor descriptor; |
| 24 net::AddressFamily address_family; | 28 net::AddressFamily address_family; |
| 25 uint32 interface_index; | 29 uint32 interface_index; |
| 26 }; | 30 }; |
| (...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 125 local_discovery::ServiceResolver::RequestStatus /* status */, | 129 local_discovery::ServiceResolver::RequestStatus /* status */, |
| 126 local_discovery::ServiceDescription /* description */) | 130 local_discovery::ServiceDescription /* description */) |
| 127 | 131 |
| 128 // Notifies browser process about local domain resolution results. | 132 // Notifies browser process about local domain resolution results. |
| 129 IPC_MESSAGE_CONTROL4( | 133 IPC_MESSAGE_CONTROL4( |
| 130 LocalDiscoveryHostMsg_LocalDomainResolverCallback, | 134 LocalDiscoveryHostMsg_LocalDomainResolverCallback, |
| 131 uint64 /* id */, | 135 uint64 /* id */, |
| 132 bool /* success */, | 136 bool /* success */, |
| 133 net::IPAddressNumber /* ip_address_ipv4 */, | 137 net::IPAddressNumber /* ip_address_ipv4 */, |
| 134 net::IPAddressNumber /* ip_address_ipv6 */) | 138 net::IPAddressNumber /* ip_address_ipv6 */) |
| OLD | NEW |