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

Unified Diff: ui/views/mus/native_widget_mus.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: Created 4 years, 12 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
Index: ui/views/mus/native_widget_mus.cc
diff --git a/ui/views/mus/native_widget_mus.cc b/ui/views/mus/native_widget_mus.cc
index cc3ebc43afd9382fe2cc8c8abbdb027313b0e9b0..0289a85257be55866f2d2d57b10dcba05efe080b 100644
--- a/ui/views/mus/native_widget_mus.cc
+++ b/ui/views/mus/native_widget_mus.cc
@@ -150,16 +150,15 @@ class ClientSideNonClientFrameView : public NonClientFrameView {
DISALLOW_COPY_AND_ASSIGN(ClientSideNonClientFrameView);
};
-mus::mojom::ResizeBehavior ResizeBehaviorFromDelegate(
- WidgetDelegate* delegate) {
- int32_t behavior = mus::mojom::RESIZE_BEHAVIOR_NONE;
+int ResizeBehaviorFromDelegate(WidgetDelegate* delegate) {
+ int32_t behavior = mus::mojom::kResizeBehaviorNone;
if (delegate->CanResize())
- behavior |= mus::mojom::RESIZE_BEHAVIOR_CAN_RESIZE;
+ behavior |= mus::mojom::kResizeBehaviorCanResize;
if (delegate->CanMaximize())
- behavior |= mus::mojom::RESIZE_BEHAVIOR_CAN_MAXIMIZE;
+ behavior |= mus::mojom::kResizeBehaviorCanMaximize;
if (delegate->CanMinimize())
- behavior |= mus::mojom::RESIZE_BEHAVIOR_CAN_MINIMIZE;
- return static_cast<mus::mojom::ResizeBehavior>(behavior);
+ behavior |= mus::mojom::kResizeBehaviorCanMinimize;
+ return behavior;
}
} // namespace
@@ -244,7 +243,8 @@ void NativeWidgetMus::ConfigurePropertiesForNewWindow(
(*properties)[mus::mojom::WindowManager::kWindowType_Property] =
mojo::TypeConverter<const std::vector<uint8_t>, int32_t>::Convert(
- mojo::ConvertTo<mus::mojom::WindowType>(init_params.type));
+ static_cast<int32_t>(
+ mojo::ConvertTo<mus::mojom::WindowType>(init_params.type)));
ConfigurePropertiesForNewWindowFromDelegate(init_params.delegate, properties);
}

Powered by Google App Engine
This is Rietveld 408576698