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

mash/wm/frame/move_loop.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/wm/frame/move_loop.h"
 
 #include "base/auto_reset.h"
 #include "components/mus/public/cpp/window.h"
 #include "components/mus/public/interfaces/input_event_constants.mojom.h"
 #include "mash/wm/property_util.h"
 #include "ui/base/hit_test.h"
 #include "ui/gfx/geometry/point_conversions.h"
 #include "ui/gfx/geometry/rect.h"
 
 namespace mash {
 namespace wm {
 
 namespace {
 
 gfx::Point EventScreenLocationToPoint(const mus::mojom::Event& event) {
   return gfx::ToFlooredPoint(
       gfx::PointF(event.pointer_data->location->screen_x,
                   event.pointer_data->location->screen_y));
 }
 
-mus::mojom::EventFlags MouseOnlyEventFlags(mus::mojom::EventFlags flags) {
-  return static_cast<mus::mojom::EventFlags>(
-      flags & (mus::mojom::EVENT_FLAGS_LEFT_MOUSE_BUTTON |
-               mus::mojom::EVENT_FLAGS_MIDDLE_MOUSE_BUTTON |
-               mus::mojom::EVENT_FLAGS_RIGHT_MOUSE_BUTTON));
+int MouseOnlyEventFlags(int flags) {
+  return flags & (mus::mojom::kEventFlagLeftMouseButton |
+                  mus::mojom::kEventFlagMiddleMouseButton |
+                  mus::mojom::kEventFlagRightMouseButton);
 }
 
 }  // namespace
 
 MoveLoop::~MoveLoop() {
   if (target_)
     target_->RemoveObserver(this);
 }
 
 // static
 scoped_ptr<MoveLoop> MoveLoop::Create(mus::Window* target,
                                       int ht_location,
                                       const mus::mojom::Event& event) {
-  DCHECK_EQ(event.action, mus::mojom::EVENT_TYPE_POINTER_DOWN);
+  DCHECK_EQ(event.action, mus::mojom::EventType::POINTER_DOWN);
   // Start a move on left mouse, or any other type of pointer.
-  if (event.pointer_data->kind == mus::mojom::POINTER_KIND_MOUSE &&
+  if (event.pointer_data->kind == mus::mojom::PointerKind::MOUSE &&
       MouseOnlyEventFlags(event.flags) !=
-          mus::mojom::EVENT_FLAGS_LEFT_MOUSE_BUTTON) {
+          mus::mojom::kEventFlagLeftMouseButton) {
     return nullptr;
   }
 
   Type type;
   HorizontalLocation h_loc;
   VerticalLocation v_loc;
   if (!DetermineType(ht_location, &type, &h_loc, &v_loc))
     return nullptr;
 
   return make_scoped_ptr(new MoveLoop(target, event, type, h_loc, v_loc));
 }
 
 MoveLoop::MoveResult MoveLoop::Move(const mus::mojom::Event& event) {
   switch (event.action) {
-    case mus::mojom::EVENT_TYPE_POINTER_CANCEL:
+    case mus::mojom::EventType::POINTER_CANCEL:
       if (event.pointer_data->pointer_id == pointer_id_) {
         if (target_)
           Revert();
         return MoveResult::DONE;
       }
       return MoveResult::CONTINUE;
 
-    case mus::mojom::EVENT_TYPE_POINTER_MOVE:
+    case mus::mojom::EventType::POINTER_MOVE:
       if (target_ && event.pointer_data->pointer_id == pointer_id_)
         MoveImpl(event);
       return MoveResult::CONTINUE;
 
-    case mus::mojom::EVENT_TYPE_POINTER_UP:
+    case mus::mojom::EventType::POINTER_UP:
       if (event.pointer_data->pointer_id == pointer_id_) {
         // TODO(sky): need to support changed_flags.
         if (target_)
           MoveImpl(event);
         return MoveResult::DONE;
       }
       return MoveResult::CONTINUE;
 
     default:
       break;
@@ skipping 139 matching lines @@
     Cancel();
 }
 
 void MoveLoop::OnWindowVisibilityChanged(mus::Window* window) {
   DCHECK_EQ(window, target_);
   Cancel();
 }
 
 }  // namespace wm
 }  // namespace mash