Change mojo enums to be scoped enums in the generated C++ bindings.

mandoline/ui/desktop_ui/browser_window.cc

Index: mandoline/ui/desktop_ui/browser_window.cc
diff --git a/mandoline/ui/desktop_ui/browser_window.cc b/mandoline/ui/desktop_ui/browser_window.cc
index eba87b612d42a053038f71e18b2b8bed3c5e724c..0285ec8b826e538ce21841475e148962be8d6918 100644
--- a/mandoline/ui/desktop_ui/browser_window.cc
+++ b/mandoline/ui/desktop_ui/browser_window.cc
@@ -212,31 +212,31 @@ void BrowserWindow::OnEmbed(mus::Window* root) {
 
   host_->AddAccelerator(
       static_cast<uint32_t>(BrowserCommand::CLOSE),
-      mus::CreateKeyMatcher(mus::mojom::KEYBOARD_CODE_W,
-                            mus::mojom::EVENT_FLAGS_CONTROL_DOWN),
+      mus::CreateKeyMatcher(mus::mojom::KeyboardCode::W,
+                            mus::mojom::kEventFlagControlDown),
       mus::mojom::WindowTreeHost::AddAcceleratorCallback());
   host_->AddAccelerator(
       static_cast<uint32_t>(BrowserCommand::FOCUS_OMNIBOX),
-      mus::CreateKeyMatcher(mus::mojom::KEYBOARD_CODE_L,
-                            mus::mojom::EVENT_FLAGS_CONTROL_DOWN),
+      mus::CreateKeyMatcher(mus::mojom::KeyboardCode::L,
+                            mus::mojom::kEventFlagControlDown),
       mus::mojom::WindowTreeHost::AddAcceleratorCallback());
   host_->AddAccelerator(
       static_cast<uint32_t>(BrowserCommand::NEW_WINDOW),
-      mus::CreateKeyMatcher(mus::mojom::KEYBOARD_CODE_N,
-                            mus::mojom::EVENT_FLAGS_CONTROL_DOWN),
+      mus::CreateKeyMatcher(mus::mojom::KeyboardCode::N,
+                            mus::mojom::kEventFlagControlDown),
       mus::mojom::WindowTreeHost::AddAcceleratorCallback());
   host_->AddAccelerator(
       static_cast<uint32_t>(BrowserCommand::SHOW_FIND),
-      mus::CreateKeyMatcher(mus::mojom::KEYBOARD_CODE_F,
-                            mus::mojom::EVENT_FLAGS_CONTROL_DOWN),
+      mus::CreateKeyMatcher(mus::mojom::KeyboardCode::F,
+                            mus::mojom::kEventFlagControlDown),
       mus::mojom::WindowTreeHost::AddAcceleratorCallback());
   host_->AddAccelerator(static_cast<uint32_t>(BrowserCommand::GO_BACK),
-                        mus::CreateKeyMatcher(mus::mojom::KEYBOARD_CODE_LEFT,
-                                              mus::mojom::EVENT_FLAGS_ALT_DOWN),
+                        mus::CreateKeyMatcher(mus::mojom::KeyboardCode::LEFT,
+                                              mus::mojom::kEventFlagAltDown),
                         mus::mojom::WindowTreeHost::AddAcceleratorCallback());
   host_->AddAccelerator(static_cast<uint32_t>(BrowserCommand::GO_FORWARD),
-                        mus::CreateKeyMatcher(mus::mojom::KEYBOARD_CODE_RIGHT,
-                                              mus::mojom::EVENT_FLAGS_ALT_DOWN),
+                        mus::CreateKeyMatcher(mus::mojom::KeyboardCode::RIGHT,
+                                              mus::mojom::kEventFlagAltDown),
                         mus::mojom::WindowTreeHost::AddAcceleratorCallback());
   // Now that we're ready, load the default url.
   LoadURL(default_url_);
@@ -319,8 +319,8 @@ void BrowserWindow::BackForwardChanged(
     web_view::mojom::ButtonState back_button,
     web_view::mojom::ButtonState forward_button) {
   toolbar_view_->SetBackForwardEnabled(
-      back_button == web_view::mojom::ButtonState::BUTTON_STATE_ENABLED,
-      forward_button == web_view::mojom::ButtonState::BUTTON_STATE_ENABLED);
+      back_button == web_view::mojom::ButtonState::ENABLED,
+      forward_button == web_view::mojom::ButtonState::ENABLED);
 }
 
 void BrowserWindow::TitleChanged(const mojo::String& title) {
@@ -408,7 +408,7 @@ void BrowserWindow::Init(mus::Window* root) {
   views::Widget::InitParams params(
       views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
   params.native_widget = new views::NativeWidgetMus(
-      widget, app_->shell(), root, mus::mojom::SURFACE_TYPE_DEFAULT);
+      widget, app_->shell(), root, mus::mojom::SurfaceType::DEFAULT);
   params.delegate = widget_delegate;
   params.bounds = root_->bounds();
   widget->Init(params);