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

Unified Diff: components/html_viewer/web_socket_handle_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 | « components/html_viewer/web_layer_tree_view_impl.cc ('k') | components/mus/common/transient_window_utils.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/html_viewer/web_socket_handle_impl.cc
diff --git a/components/html_viewer/web_socket_handle_impl.cc b/components/html_viewer/web_socket_handle_impl.cc
index e33aeaf48f767b7d0075bab2c29fd64feaa1ac59..e2520d2125a86013b3db2ab135e8014ac482505a 100644
--- a/components/html_viewer/web_socket_handle_impl.cc
+++ b/components/html_viewer/web_socket_handle_impl.cc
@@ -43,14 +43,14 @@ struct TypeConverter<WebSocket::MessageType, WebSocketHandle::MessageType> {
typedef WebSocket::MessageType MessageType;
static_assert(
static_cast<MessageType>(WebSocketHandle::MessageTypeContinuation) ==
- WebSocket::MESSAGE_TYPE_CONTINUATION,
+ WebSocket::MessageType::CONTINUATION,
"WebSocket and WebSocketHandle enum values must match");
static_assert(static_cast<MessageType>(WebSocketHandle::MessageTypeText) ==
- WebSocket::MESSAGE_TYPE_TEXT,
+ WebSocket::MessageType::TEXT,
"WebSocket and WebSocketHandle enum values must match");
static_assert(
static_cast<MessageType>(WebSocketHandle::MessageTypeBinary) ==
- WebSocket::MESSAGE_TYPE_BINARY,
+ WebSocket::MessageType::BINARY,
"WebSocket and WebSocketHandle enum values must match");
return static_cast<WebSocket::MessageType>(type);
}
@@ -59,9 +59,9 @@ struct TypeConverter<WebSocket::MessageType, WebSocketHandle::MessageType> {
template<>
struct TypeConverter<WebSocketHandle::MessageType, WebSocket::MessageType> {
static WebSocketHandle::MessageType 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);
return static_cast<WebSocketHandle::MessageType>(type);
}
};
« no previous file with comments | « components/html_viewer/web_layer_tree_view_impl.cc ('k') | components/mus/common/transient_window_utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698