Refactoring button field and its type (2nd try)

ui/events/blink/web_input_event.cc

 // Copyright 2016 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 "ui/events/blink/web_input_event.h"
 
 #include "ui/events/base_event_utils.h"
 #include "ui/events/blink/blink_event_util.h"
 #include "ui/events/event.h"
 #include "ui/events/event_utils.h"
@@ skipping 124 matching lines @@
   webkit_event.text[0] = event.GetText();
 
   return webkit_event;
 }
 
 blink::WebMouseWheelEvent MakeWebMouseWheelEventFromUiEvent(
     const ScrollEvent& event) {
   blink::WebMouseWheelEvent webkit_event;
 
   webkit_event.type = blink::WebInputEvent::MouseWheel;
-  webkit_event.button = blink::WebMouseEvent::ButtonNone;
+  webkit_event.button = blink::WebMouseEvent::Button::NoButton;
   webkit_event.modifiers = EventFlagsToWebEventModifiers(event.flags());
   webkit_event.timeStampSeconds = EventTimeStampToSeconds(event.time_stamp());
   webkit_event.hasPreciseScrollingDeltas = true;
 
   float offset_ordinal_x = 0.f;
   float offset_ordinal_y = 0.f;
   if ((event.flags() & EF_SHIFT_DOWN) != 0 && event.x_offset() == 0) {
     webkit_event.deltaX = event.y_offset();
     webkit_event.deltaY = 0;
     offset_ordinal_x = event.y_offset_ordinal();
@@ skipping 248 matching lines @@
   gesture_event.timeStampSeconds = EventTimeStampToSeconds(EventTimeForNow());
   gesture_event.sourceDevice = blink::WebGestureDeviceTouchpad;
   return gesture_event;
 }
 
 blink::WebMouseEvent MakeWebMouseEventFromUiEvent(const MouseEvent& event) {
   blink::WebMouseEvent webkit_event;
 
   webkit_event.modifiers = EventFlagsToWebEventModifiers(event.flags());
   webkit_event.timeStampSeconds = EventTimeStampToSeconds(event.time_stamp());
-  webkit_event.button = blink::WebMouseEvent::ButtonNone;
+  webkit_event.button = blink::WebMouseEvent::Button::NoButton;
   int button_flags = event.flags();
   if (event.type() == ET_MOUSE_PRESSED || event.type() == ET_MOUSE_RELEASED) {
     // We want to use changed_button_flags() for mouse pressed & released.
     // These flags can be used only if they are set which is not always the case
     // (see e.g. GetChangedMouseButtonFlagsFromNative() in events_win.cc).
     if (event.changed_button_flags())
       button_flags = event.changed_button_flags();
   }
   if (button_flags & EF_LEFT_MOUSE_BUTTON)
-    webkit_event.button = blink::WebMouseEvent::ButtonLeft;
+    webkit_event.button = blink::WebMouseEvent::Button::Left;
   if (button_flags & EF_MIDDLE_MOUSE_BUTTON)
-    webkit_event.button = blink::WebMouseEvent::ButtonMiddle;
+    webkit_event.button = blink::WebMouseEvent::Button::Middle;
   if (button_flags & EF_RIGHT_MOUSE_BUTTON)
-    webkit_event.button = blink::WebMouseEvent::ButtonRight;
+    webkit_event.button = blink::WebMouseEvent::Button::Right;
 
   switch (event.type()) {
     case ET_MOUSE_PRESSED:
       webkit_event.type = blink::WebInputEvent::MouseDown;
       webkit_event.clickCount = event.GetClickCount();
       break;
     case ET_MOUSE_RELEASED:
       webkit_event.type = blink::WebInputEvent::MouseUp;
       webkit_event.clickCount = event.GetClickCount();
       break;
@@ skipping 15 matching lines @@
       EventPointerTypeToWebPointerType(event.pointer_details().pointer_type);
 
   return webkit_event;
 }
 
 blink::WebMouseWheelEvent MakeWebMouseWheelEventFromUiEvent(
     const MouseWheelEvent& event) {
   blink::WebMouseWheelEvent webkit_event;
 
   webkit_event.type = blink::WebInputEvent::MouseWheel;
-  webkit_event.button = blink::WebMouseEvent::ButtonNone;
+  webkit_event.button = blink::WebMouseEvent::Button::NoButton;
   webkit_event.modifiers = EventFlagsToWebEventModifiers(event.flags());
   webkit_event.timeStampSeconds = EventTimeStampToSeconds(event.time_stamp());
 
   if ((event.flags() & EF_SHIFT_DOWN) != 0 && event.x_offset() == 0) {
     webkit_event.deltaX = event.y_offset();
     webkit_event.deltaY = 0;
   } else {
     webkit_event.deltaX = event.x_offset();
     webkit_event.deltaY = event.y_offset();
   }
 
   webkit_event.wheelTicksX = webkit_event.deltaX / kPixelsPerTick;
   webkit_event.wheelTicksY = webkit_event.deltaY / kPixelsPerTick;
 
   webkit_event.tiltX = roundf(event.pointer_details().tilt_x);
   webkit_event.tiltY = roundf(event.pointer_details().tilt_y);
   webkit_event.force = event.pointer_details().force;
   webkit_event.pointerType =
       EventPointerTypeToWebPointerType(event.pointer_details().pointer_type);
 
   return webkit_event;
 }
 
 }  // namespace ui