Refactoring button field and its type (2nd try)

content/renderer/pepper/event_conversion.cc

 // Copyright (c) 2012 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 "content/renderer/pepper/event_conversion.h"
 
 #include <stddef.h>
 #include <stdint.h>
 #include <string.h>
 
@@ skipping 153 matching lines @@
     result.event_modifiers = key_event.modifiers;
     base::WriteUnicodeCharacter(iter.get(), &result.character_text);
 
     result_events->push_back(result);
     iter.Advance();
   }
 }
 
 void AppendMouseEvent(const WebInputEvent& event,
                       std::vector<InputEventData>* result_events) {
-  static_assert(static_cast<int>(WebMouseEvent::ButtonNone) ==
+  static_assert(static_cast<int>(WebMouseEvent::Button::NoButton) ==
                     static_cast<int>(PP_INPUTEVENT_MOUSEBUTTON_NONE),
                 "MouseNone should match");
-  static_assert(static_cast<int>(WebMouseEvent::ButtonLeft) ==
+  static_assert(static_cast<int>(WebMouseEvent::Button::Left) ==
                     static_cast<int>(PP_INPUTEVENT_MOUSEBUTTON_LEFT),
                 "MouseLeft should match");
-  static_assert(static_cast<int>(WebMouseEvent::ButtonRight) ==
+  static_assert(static_cast<int>(WebMouseEvent::Button::Right) ==
                     static_cast<int>(PP_INPUTEVENT_MOUSEBUTTON_RIGHT),
                 "MouseRight should match");
-  static_assert(static_cast<int>(WebMouseEvent::ButtonMiddle) ==
+  static_assert(static_cast<int>(WebMouseEvent::Button::Middle) ==
                     static_cast<int>(PP_INPUTEVENT_MOUSEBUTTON_MIDDLE),
                 "MouseMiddle should match");
 
   const WebMouseEvent& mouse_event = static_cast<const WebMouseEvent&>(event);
   InputEventData result = GetEventWithCommonFieldsAndType(event);
   result.event_modifiers = mouse_event.modifiers;
   if (mouse_event.type == WebInputEvent::MouseDown ||
       mouse_event.type == WebInputEvent::MouseMove ||
       mouse_event.type == WebInputEvent::MouseUp) {
     result.mouse_button =
@@ skipping 231 matching lines @@
       mouse_event->type = WebInputEvent::ContextMenu;
       break;
     default:
       NOTREACHED();
   }
   mouse_event->timeStampSeconds = event.event_time_stamp;
   mouse_event->modifiers = event.event_modifiers;
   mouse_event->button = static_cast<WebMouseEvent::Button>(event.mouse_button);
   if (mouse_event->type == WebInputEvent::MouseMove) {
     if (mouse_event->modifiers & WebInputEvent::LeftButtonDown)
-      mouse_event->button = WebMouseEvent::ButtonLeft;
+      mouse_event->button = WebMouseEvent::Button::Left;
     else if (mouse_event->modifiers & WebInputEvent::MiddleButtonDown)
-      mouse_event->button = WebMouseEvent::ButtonMiddle;
+      mouse_event->button = WebMouseEvent::Button::Middle;
     else if (mouse_event->modifiers & WebInputEvent::RightButtonDown)
-      mouse_event->button = WebMouseEvent::ButtonRight;
+      mouse_event->button = WebMouseEvent::Button::Right;
   }
   mouse_event->x = event.mouse_position.x;
   mouse_event->y = event.mouse_position.y;
   mouse_event->clickCount = event.mouse_click_count;
   mouse_event->movementX = event.mouse_movement.x;
   mouse_event->movementY = event.mouse_movement.y;
   return mouse_event;
 }
 
 WebMouseWheelEvent* BuildMouseWheelEvent(const InputEventData& event) {
@@ skipping 290 matching lines @@
       return PP_INPUTEVENT_CLASS_TOUCH;
     case WebInputEvent::TouchScrollStarted:
       return PP_InputEvent_Class(0);
     default:
       CHECK(WebInputEvent::isGestureEventType(type));
       return PP_InputEvent_Class(0);
   }
 }
 
 }  // namespace content