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

components/html_viewer/touch_handler.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/html_viewer/touch_handler.h"
 
 #include "components/mus/public/interfaces/input_events.mojom.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
 #include "third_party/WebKit/public/web/WebWidget.h"
 #include "ui/events/base_event_utils.h"
@@ skipping 12 matching lines @@
     properties->id = event.pointer_data->pointer_id;
     if (event.pointer_data->location) {
       properties->x = event.pointer_data->location->x;
       properties->y = event.pointer_data->location->y;
       properties->raw_x = event.pointer_data->location->screen_x;
       properties->raw_y = event.pointer_data->location->screen_y;
     }
   }
 
   if (event.pointer_data && event.pointer_data->brush_data &&
-      (event.pointer_data->kind == mus::mojom::POINTER_KIND_TOUCH ||
-       event.pointer_data->kind == mus::mojom::POINTER_KIND_PEN)) {
+      (event.pointer_data->kind == mus::mojom::PointerKind::TOUCH ||
+       event.pointer_data->kind == mus::mojom::PointerKind::PEN)) {
     properties->pressure = event.pointer_data->brush_data->pressure;
 
     // TODO(rjkroege): vary orientation for width, height.
     properties->SetAxesAndOrientation(event.pointer_data->brush_data->width,
                                       event.pointer_data->brush_data->height,
                                       0.0);
   } else {
-    if (event.flags & mus::mojom::EVENT_FLAGS_LEFT_MOUSE_BUTTON ||
-        event.flags & mus::mojom::EVENT_FLAGS_MIDDLE_MOUSE_BUTTON ||
-        event.flags & mus::mojom::EVENT_FLAGS_MIDDLE_MOUSE_BUTTON) {
+    if (event.flags & mus::mojom::kEventFlagLeftMouseButton ||
+        event.flags & mus::mojom::kEventFlagMiddleMouseButton ||
+        event.flags & mus::mojom::kEventFlagMiddleMouseButton) {
       properties->pressure = 0.5;
     } else {
       properties->pressure = 0.0;
     }
   }
   // TODO(sky): Add support for tool_type.
 }
 
 }  // namespace
 
@@ skipping 35 matching lines @@
   SetPropertiesFromEvent(event, &properties);
 
   const base::TimeTicks timestamp(
       base::TimeTicks::FromInternalValue(event.time_stamp));
   if (current_motion_event_.get()) {
     current_motion_event_->set_unique_event_id(ui::GetNextTouchEventId());
     current_motion_event_->set_event_time(timestamp);
   }
 
   switch (event.action) {
-    case mus::mojom::EVENT_TYPE_POINTER_DOWN:
+    case mus::mojom::EventType::POINTER_DOWN:
       if (!current_motion_event_.get()) {
         current_motion_event_.reset(new ui::MotionEventGeneric(
             ui::MotionEvent::ACTION_DOWN, timestamp, properties));
       } else {
         const int index =
             current_motion_event_->FindPointerIndexOfId(properties.id);
         if (index != -1) {
           DVLOG(1) << "pointer down and pointer already down id="
                    << properties.id;
           return false;
         }
         current_motion_event_->PushPointer(properties);
         current_motion_event_->set_action(ui::MotionEvent::ACTION_POINTER_DOWN);
         current_motion_event_->set_action_index(static_cast<int>(index));
       }
       return true;
 
-    case mus::mojom::EVENT_TYPE_POINTER_UP: {
+    case mus::mojom::EventType::POINTER_UP: {
       if (!current_motion_event_.get()) {
         DVLOG(1) << "pointer up with no event, id=" << properties.id;
         return false;
       }
       const int index =
           current_motion_event_->FindPointerIndexOfId(properties.id);
       if (index == -1) {
         DVLOG(1) << "pointer up and pointer not down id=" << properties.id;
         return false;
       }
       current_motion_event_->pointer(index) = properties;
       current_motion_event_->set_action(
           current_motion_event_->GetPointerCount() == 1
               ? ui::MotionEvent::ACTION_UP
               : ui::MotionEvent::ACTION_POINTER_UP);
       current_motion_event_->set_action_index(static_cast<int>(index));
       return true;
     }
 
-    case mus::mojom::EVENT_TYPE_POINTER_MOVE: {
+    case mus::mojom::EventType::POINTER_MOVE: {
       if (!current_motion_event_.get()) {
         DVLOG(1) << "pointer move with no event, id=" << properties.id;
         return false;
       }
       const int index =
           current_motion_event_->FindPointerIndexOfId(properties.id);
       if (index == -1) {
         DVLOG(1) << "pointer move and pointer not down id=" << properties.id;
         return false;
       }
       current_motion_event_->pointer(index) = properties;
       current_motion_event_->set_action(ui::MotionEvent::ACTION_MOVE);
       current_motion_event_->set_action_index(static_cast<int>(index));
       return true;
     }
 
-    case mus::mojom::EVENT_TYPE_POINTER_CANCEL: {
+    case mus::mojom::EventType::POINTER_CANCEL: {
       if (!current_motion_event_.get()) {
         DVLOG(1) << "canel with no event, id=" << properties.id;
         return false;
       }
       const int index =
           current_motion_event_->FindPointerIndexOfId(properties.id);
       if (index == -1) {
         DVLOG(1) << "cancel and pointer not down id=" << properties.id;
         return false;
       }
@@ skipping 17 matching lines @@
 
   blink::WebTouchEvent web_event = ui::CreateWebTouchEventFromMotionEvent(
       *current_motion_event_, result.did_generate_scroll);
   gesture_provider_.OnTouchEventAck(web_event.uniqueTouchEventId,
                                     web_widget_->handleInputEvent(web_event) !=
                                         blink::WebInputEventResult::NotHandled);
 }
 
 void TouchHandler::PostProcessMotionEvent(const mus::mojom::Event& event) {
   switch (event.action) {
-    case mus::mojom::EVENT_TYPE_POINTER_UP: {
+    case mus::mojom::EventType::POINTER_UP: {
       if (event.pointer_data) {
         const int index = current_motion_event_->FindPointerIndexOfId(
             event.pointer_data->pointer_id);
         current_motion_event_->RemovePointerAt(index);
       }
       if (current_motion_event_->GetPointerCount() == 0)
         current_motion_event_.reset();
       break;
     }
 
-    case mus::mojom::EVENT_TYPE_POINTER_CANCEL:
+    case mus::mojom::EventType::POINTER_CANCEL:
       current_motion_event_.reset();
       break;
 
     default:
       break;
   }
 }
 
 }  // namespace html_viewer