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

components/mus/ws/window_tree_host_impl.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 "components/mus/ws/window_tree_host_impl.h"
 
 #include "base/debug/debugger.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/mus/common/types.h"
 #include "components/mus/public/interfaces/input_event_constants.mojom.h"
@@ skipping 15 matching lines @@
   return base::TimeDelta::FromMilliseconds(100);
 #else
   return base::TimeDelta::FromMilliseconds(1000);
 #endif
 }
 
 bool EventsCanBeCoalesced(const mojom::Event& one, const mojom::Event& two) {
   if (one.action != two.action || one.flags != two.flags)
     return false;
   // TODO(sad): wheel events can also be merged.
-  if (one.action != mojom::EVENT_TYPE_POINTER_MOVE)
+  if (one.action != mojom::EventType::POINTER_MOVE)
     return false;
   DCHECK(one.pointer_data);
   DCHECK(two.pointer_data);
   if (one.pointer_data->kind != two.pointer_data->kind ||
       one.pointer_data->pointer_id != two.pointer_data->pointer_id)
     return false;
 
   return true;
 }
 
 mojom::EventPtr CoalesceEvents(mojom::EventPtr first, mojom::EventPtr second) {
-  DCHECK_EQ(first->action, mojom::EVENT_TYPE_POINTER_MOVE)
+  DCHECK_EQ(first->action, mojom::EventType::POINTER_MOVE)
       << " Non-move events cannot be merged yet.";
   // For mouse moves, the new event just replaces the old event.
   return second;
 }
 
 }  // namespace
 
 WindowTreeHostImpl::WindowTreeHostImpl(
     mojom::WindowTreeHostClientPtr client,
     ConnectionManager* connection_manager,
@@ skipping 360 matching lines @@
 ServerWindow* WindowTreeHostImpl::GetFocusedWindowForEventDispatcher() {
   return GetFocusedWindow();
 }
 
 void WindowTreeHostImpl::DispatchInputEventToWindow(ServerWindow* target,
                                                     bool in_nonclient_area,
                                                     mojom::EventPtr event) {
   DCHECK(!event_ack_timer_.IsRunning());
 
   if (event->pointer_data &&
-      event->pointer_data->kind == mojom::PointerKind::POINTER_KIND_MOUSE) {
+      event->pointer_data->kind == mojom::PointerKind::MOUSE) {
     DCHECK(event_dispatcher_.mouse_cursor_source_window());
     UpdateNativeCursor(
         event_dispatcher_.mouse_cursor_source_window()->cursor());
   }
 
   // If the event is in the non-client area the event goes to the owner of
   // the window. Otherwise if the window is an embed root, forward to the
   // embedded window.
   WindowTreeImpl* connection =
       in_nonclient_area
@@ skipping 14 matching lines @@
                          &WindowTreeHostImpl::OnEventAckTimeout);
 }
 
 void WindowTreeHostImpl::OnWindowDestroyed(ServerWindow* window) {
   windows_needing_frame_destruction_.erase(window);
   window->RemoveObserver(this);
 }
 
 }  // namespace ws
 }  // namespace mus