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

Unified Diff: mojo/services/network/web_socket_impl.cc

Issue 1527183003: Change mojo enums to be scoped enums in the generated C++ bindings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@mojo-binding-equals
Patch Set: rebase Created 4 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mojo/services/network/udp_socket_apptest.cc ('k') | net/dns/host_resolver_mojo_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/services/network/web_socket_impl.cc
diff --git a/mojo/services/network/web_socket_impl.cc b/mojo/services/network/web_socket_impl.cc
index 9b2e8f71883e1c5a8c6203d9af52f65e0687383d..459b5317872d01b44a3240a07b98351dde7f77bb 100644
--- a/mojo/services/network/web_socket_impl.cc
+++ b/mojo/services/network/web_socket_impl.cc
@@ -30,19 +30,19 @@ struct TypeConverter<net::WebSocketFrameHeader::OpCode,
WebSocket::MessageType> {
static net::WebSocketFrameHeader::OpCode Convert(
WebSocket::MessageType type) {
- DCHECK(type == WebSocket::MESSAGE_TYPE_CONTINUATION ||
- type == WebSocket::MESSAGE_TYPE_TEXT ||
- type == WebSocket::MESSAGE_TYPE_BINARY);
+ DCHECK(type == WebSocket::MessageType::CONTINUATION ||
+ type == WebSocket::MessageType::TEXT ||
+ type == WebSocket::MessageType::BINARY);
typedef net::WebSocketFrameHeader::OpCode OpCode;
// These compile asserts verify that the same underlying values are used for
// both types, so we can simply cast between them.
- static_assert(static_cast<OpCode>(WebSocket::MESSAGE_TYPE_CONTINUATION) ==
+ static_assert(static_cast<OpCode>(WebSocket::MessageType::CONTINUATION) ==
net::WebSocketFrameHeader::kOpCodeContinuation,
"enum values must match for opcode continuation");
- static_assert(static_cast<OpCode>(WebSocket::MESSAGE_TYPE_TEXT) ==
+ static_assert(static_cast<OpCode>(WebSocket::MessageType::TEXT) ==
net::WebSocketFrameHeader::kOpCodeText,
"enum values must match for opcode text");
- static_assert(static_cast<OpCode>(WebSocket::MESSAGE_TYPE_BINARY) ==
+ static_assert(static_cast<OpCode>(WebSocket::MessageType::BINARY) ==
net::WebSocketFrameHeader::kOpCodeBinary,
"enum values must match for opcode binary");
return static_cast<OpCode>(type);
« no previous file with comments | « mojo/services/network/udp_socket_apptest.cc ('k') | net/dns/host_resolver_mojo_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698