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

mash/browser_driver/browser_driver_application_delegate.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "mash/browser_driver/browser_driver_application_delegate.h"
 
 #include <stdint.h>
 
 #include "base/bind.h"
 #include "components/mus/public/cpp/event_matcher.h"
 #include "mojo/shell/public/cpp/application_connection.h"
 #include "mojo/shell/public/cpp/application_impl.h"
 
 namespace mash {
 namespace browser_driver {
 namespace {
 
 enum class Accelerator : uint32_t {
   NewWindow,
   NewTab,
   NewIncognitoWindow,
 };
 
 struct AcceleratorSpec {
   Accelerator id;
   mus::mojom::KeyboardCode keyboard_code;
-  mus::mojom::EventFlags event_flags;
+  // A bitfield of kEventFlag* and kMouseEventFlag* values in
+  // input_event_constants.mojom.
+  int event_flags;
 };
 
 AcceleratorSpec g_spec[] = {
-  { Accelerator::NewWindow,
-    mus::mojom::KEYBOARD_CODE_N,
-    mus::mojom::EVENT_FLAGS_CONTROL_DOWN },
-  { Accelerator::NewTab,
-    mus::mojom::KEYBOARD_CODE_T,
-    mus::mojom::EVENT_FLAGS_CONTROL_DOWN },
-  { Accelerator::NewIncognitoWindow,
-    mus::mojom::KEYBOARD_CODE_N,
-    static_cast<mus::mojom::EventFlags>(mus::mojom::EVENT_FLAGS_CONTROL_DOWN |
-        mus::mojom::EVENT_FLAGS_SHIFT_DOWN) },
+    {Accelerator::NewWindow, mus::mojom::KeyboardCode::N,
+     mus::mojom::kEventFlagControlDown},
+    {Accelerator::NewTab, mus::mojom::KeyboardCode::T,
+     mus::mojom::kEventFlagControlDown},
+    {Accelerator::NewIncognitoWindow, mus::mojom::KeyboardCode::N,
+     mus::mojom::kEventFlagControlDown | mus::mojom::kEventFlagShiftDown},
 };
 
 void AssertTrue(bool success) {
   DCHECK(success);
 }
 
 }  // namespace
 
 BrowserDriverApplicationDelegate::BrowserDriverApplicationDelegate()
     : app_(nullptr),
@@ skipping 47 matching lines @@
   for (const AcceleratorSpec& spec : g_spec) {
     registrar->AddAccelerator(
         static_cast<uint32_t>(spec.id),
         mus::CreateKeyMatcher(spec.keyboard_code, spec.event_flags),
         base::Bind(&AssertTrue));
   }
 }
 
 }  // namespace browser_driver
 }  // namespace main