Refactoring button field and its type (2nd try)

third_party/WebKit/public/platform/WebPointerProperties.h

Index: third_party/WebKit/public/platform/WebPointerProperties.h
diff --git a/third_party/WebKit/public/platform/WebPointerProperties.h b/third_party/WebKit/public/platform/WebPointerProperties.h
index 72d6086845149f2c17a62dfc775838a096aa1db9..0c0e13e93e3e0ed129b53ac9af6d98c4af0f3ba3 100644
--- a/third_party/WebKit/public/platform/WebPointerProperties.h
+++ b/third_party/WebKit/public/platform/WebPointerProperties.h
@@ -5,6 +5,7 @@
 #ifndef WebPointerProperties_h
 #define WebPointerProperties_h
 
+#include <cstdint>
 #include <limits>
 
 namespace blink {
@@ -17,23 +18,23 @@ namespace blink {
 class WebPointerProperties {
 public:
     WebPointerProperties()
-        : button(ButtonNone)
-        , id(0)
+        : id(0)
         , force(std::numeric_limits<float>::quiet_NaN())
         , tiltX(0)
         , tiltY(0)
+        , button(Button::NoButton)
         , pointerType(PointerType::Unknown)
     {
     }
 
-    enum Button {
-        ButtonNone = -1,
-        ButtonLeft,
-        ButtonMiddle,
-        ButtonRight
+    enum class Button {
+        NoButton = -1,
+        Left,
+        Middle,
+        Right
     };
 
-    enum class PointerType : int {
+    enum class PointerType {
         Unknown,
         Mouse,
         Pen,
@@ -41,8 +42,6 @@ public:
         LastEntry = Touch // Must be the last entry in the list
     };
 
-    Button button;
-
     int id;
 
     // The valid range is [0,1], with NaN meaning pressure is not supported by
@@ -55,6 +54,7 @@ public:
     int tiltX;
     int tiltY;
 
+    Button button;
     PointerType pointerType;
 };