diff options
| author | tsepez@chromium.org <tsepez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-07 00:29:41 +0000 |
|---|---|---|
| committer | tsepez@chromium.org <tsepez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-07 00:29:41 +0000 |
| commit | ed14f9f4b6069495c55062eb68f87244b082b704 (patch) | |
| tree | c8112d9557be5abe1151f70f905aab8e70078e17 /chrome/common/local_discovery | |
| parent | 7a5f27003d21d0f0829f369451c7de67dc969eff (diff) | |
| download | chromium_src-ed14f9f4b6069495c55062eb68f87244b082b704.zip chromium_src-ed14f9f4b6069495c55062eb68f87244b082b704.tar.gz chromium_src-ed14f9f4b6069495c55062eb68f87244b082b704.tar.bz2 | |
Use validating form of IPC enum macros for local discovery messages.
This is part of a long-running background task to remove the remaining
uses of the unchecked IPC_ENUM_TRAITS() macro.
BUG=246708
Review URL: https://codereview.chromium.org/157013004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@249560 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/local_discovery')
| -rw-r--r-- | chrome/common/local_discovery/local_discovery_messages.h | 13 | ||||
| -rw-r--r-- | chrome/common/local_discovery/service_discovery_client.h | 6 |
2 files changed, 13 insertions, 6 deletions
diff --git a/chrome/common/local_discovery/local_discovery_messages.h b/chrome/common/local_discovery/local_discovery_messages.h index f15bad6..e34ab6f 100644 --- a/chrome/common/local_discovery/local_discovery_messages.h +++ b/chrome/common/local_discovery/local_discovery_messages.h @@ -30,6 +30,15 @@ struct LocalDiscoveryMsg_SocketInfo { #define IPC_MESSAGE_START LocalDiscoveryMsgStart +IPC_ENUM_TRAITS_MAX_VALUE(local_discovery::ServiceWatcher::UpdateType, + local_discovery::ServiceWatcher::UPDATE_TYPE_LAST) + +IPC_ENUM_TRAITS_MAX_VALUE( + local_discovery::ServiceResolver::RequestStatus, + local_discovery::ServiceResolver::REQUEST_STATUS_LAST) + +IPC_ENUM_TRAITS_MAX_VALUE(net::AddressFamily, net::ADDRESS_FAMILY_LAST) + IPC_STRUCT_TRAITS_BEGIN(local_discovery::ServiceDescription) IPC_STRUCT_TRAITS_MEMBER(service_name) IPC_STRUCT_TRAITS_MEMBER(address) @@ -38,10 +47,6 @@ IPC_STRUCT_TRAITS_BEGIN(local_discovery::ServiceDescription) IPC_STRUCT_TRAITS_MEMBER(last_seen) IPC_STRUCT_TRAITS_END() -IPC_ENUM_TRAITS(local_discovery::ServiceWatcher::UpdateType) -IPC_ENUM_TRAITS(local_discovery::ServiceResolver::RequestStatus) -IPC_ENUM_TRAITS(net::AddressFamily) - #if defined(OS_POSIX) IPC_STRUCT_TRAITS_BEGIN(LocalDiscoveryMsg_SocketInfo) IPC_STRUCT_TRAITS_MEMBER(descriptor) diff --git a/chrome/common/local_discovery/service_discovery_client.h b/chrome/common/local_discovery/service_discovery_client.h index 9b1b6ba..0257e5d 100644 --- a/chrome/common/local_discovery/service_discovery_client.h +++ b/chrome/common/local_discovery/service_discovery_client.h @@ -52,7 +52,8 @@ class ServiceWatcher { UPDATE_ADDED, UPDATE_CHANGED, UPDATE_REMOVED, - UPDATE_INVALIDATED + UPDATE_INVALIDATED, + UPDATE_TYPE_LAST = UPDATE_INVALIDATED }; // Called when a service has been added or removed for a certain service name. @@ -79,7 +80,8 @@ class ServiceResolver { enum RequestStatus { STATUS_SUCCESS, STATUS_REQUEST_TIMEOUT, - STATUS_KNOWN_NONEXISTENT + STATUS_KNOWN_NONEXISTENT, + REQUEST_STATUS_LAST = STATUS_KNOWN_NONEXISTENT }; // A callback called once the service has been resolved. |