Refactoring button field and its type (2nd try)

ui/events/blink/web_input_event_builders_win.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_builders_win.h"
 
 #include "ui/display/win/screen_win.h"
 #include "ui/events/blink/blink_event_util.h"
 #include "ui/events/event_utils.h"
 
@@ skipping 83 matching lines @@
     WPARAM wparam,
     LPARAM lparam,
     double time_stamp,
     blink::WebPointerProperties::PointerType pointer_type) {
   WebMouseEvent result;
 
   switch (message) {
     case WM_MOUSEMOVE:
       result.type = WebInputEvent::MouseMove;
       if (wparam & MK_LBUTTON)
-        result.button = WebMouseEvent::ButtonLeft;
+        result.button = WebMouseEvent::Button::Left;
       else if (wparam & MK_MBUTTON)
-        result.button = WebMouseEvent::ButtonMiddle;
+        result.button = WebMouseEvent::Button::Middle;
       else if (wparam & MK_RBUTTON)
-        result.button = WebMouseEvent::ButtonRight;
+        result.button = WebMouseEvent::Button::Right;
       else
-        result.button = WebMouseEvent::ButtonNone;
+        result.button = WebMouseEvent::Button::NoButton;
       break;
     case WM_MOUSELEAVE:
     case WM_NCMOUSELEAVE:
       // TODO(rbyers): This should be MouseLeave but is disabled temporarily.
       // See http://crbug.com/450631
       result.type = WebInputEvent::MouseMove;
-      result.button = WebMouseEvent::ButtonNone;
+      result.button = WebMouseEvent::Button::NoButton;
       // set the current mouse position (relative to the client area of the
       // current window) since none is specified for this event
       lparam = GetRelativeCursorPos(hwnd);
       break;
     case WM_LBUTTONDOWN:
     case WM_LBUTTONDBLCLK:
       result.type = WebInputEvent::MouseDown;
-      result.button = WebMouseEvent::ButtonLeft;
+      result.button = WebMouseEvent::Button::Left;
       break;
     case WM_MBUTTONDOWN:
     case WM_MBUTTONDBLCLK:
       result.type = WebInputEvent::MouseDown;
-      result.button = WebMouseEvent::ButtonMiddle;
+      result.button = WebMouseEvent::Button::Middle;
       break;
     case WM_RBUTTONDOWN:
     case WM_RBUTTONDBLCLK:
       result.type = WebInputEvent::MouseDown;
-      result.button = WebMouseEvent::ButtonRight;
+      result.button = WebMouseEvent::Button::Right;
       break;
     case WM_LBUTTONUP:
       result.type = WebInputEvent::MouseUp;
-      result.button = WebMouseEvent::ButtonLeft;
+      result.button = WebMouseEvent::Button::Left;
       break;
     case WM_MBUTTONUP:
       result.type = WebInputEvent::MouseUp;
-      result.button = WebMouseEvent::ButtonMiddle;
+      result.button = WebMouseEvent::Button::Middle;
       break;
     case WM_RBUTTONUP:
       result.type = WebInputEvent::MouseUp;
-      result.button = WebMouseEvent::ButtonRight;
+      result.button = WebMouseEvent::Button::Right;
       break;
     default:
       NOTREACHED();
   }
 
   result.timeStampSeconds = time_stamp;
   result.pointerType = pointer_type;
 
   // set position fields:
 
@@ skipping 11 matching lines @@
 
   result.globalX = dip_global_point.x();
   result.globalY = dip_global_point.y();
 
   // calculate number of clicks:
 
   // This differs slightly from the WebKit code in WebKit/win/WebView.cpp
   // where their original code looks buggy.
   static int last_click_position_x;
   static int last_click_position_y;
-  static WebMouseEvent::Button last_click_button = WebMouseEvent::ButtonLeft;
+  static WebMouseEvent::Button last_click_button = WebMouseEvent::Button::Left;
 
   double current_time = result.timeStampSeconds;
   bool cancel_previous_click =
       (abs(last_click_position_x - result.x) >
        (::GetSystemMetrics(SM_CXDOUBLECLK) / 2)) ||
       (abs(last_click_position_y - result.y) >
        (::GetSystemMetrics(SM_CYDOUBLECLK) / 2)) ||
       ((current_time - g_last_click_time) * 1000.0 > ::GetDoubleClickTime());
 
   if (result.type == WebInputEvent::MouseDown) {
@@ skipping 42 matching lines @@
     WPARAM wparam,
     LPARAM lparam,
     double time_stamp,
     blink::WebPointerProperties::PointerType pointer_type) {
   WebMouseWheelEvent result;
 
   result.type = WebInputEvent::MouseWheel;
 
   result.timeStampSeconds = time_stamp;
 
-  result.button = WebMouseEvent::ButtonNone;
+  result.button = WebMouseEvent::Button::NoButton;
 
   result.pointerType = pointer_type;
 
   // Get key state, coordinates, and wheel delta from event.
   UINT key_state;
   float wheel_delta;
   bool horizontal_scroll = false;
   if ((message == WM_VSCROLL) || (message == WM_HSCROLL)) {
     // Synthesize mousewheel event from a scroll event.  This is needed to
     // simulate middle mouse scrolling in some laptops.  Use GetAsyncKeyState
@@ skipping 114 matching lines @@
     result.wheelTicksX = wheel_delta;
   } else {
     result.deltaY = scroll_delta;
     result.wheelTicksY = wheel_delta;
   }
 
   return result;
 }
 
 }  // namespace ui