Move the Pepper implementation from webkit/glue/plugins/pepper_* to...

webkit/plugins/ppapi/event_conversion.cc

 // Copyright (c) 2010 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 "webkit/glue/plugins/pepper_event_conversion.h"
+#include "webkit/plugins/ppapi/event_conversion.h"
 
 #include "base/i18n/char_iterator.h"
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/utf_string_conversion_utils.h"
 #include "ppapi/c/pp_input_event.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h"
-#include "webkit/glue/plugins/pepper_common.h"
+#include "webkit/plugins/ppapi/common.h"
 
 using WebKit::WebInputEvent;
 using WebKit::WebKeyboardEvent;
 using WebKit::WebMouseEvent;
 using WebKit::WebMouseWheelEvent;
 
+namespace webkit {
+namespace ppapi {
+
 namespace {
 
 PP_InputEvent_Type ConvertEventTypes(WebInputEvent::Type wetype) {
   switch (wetype) {
     case WebInputEvent::MouseDown:
       return PP_INPUTEVENT_TYPE_MOUSEDOWN;
     case WebInputEvent::MouseUp:
       return PP_INPUTEVENT_TYPE_MOUSEUP;
     case WebInputEvent::MouseMove:
       return PP_INPUTEVENT_TYPE_MOUSEMOVE;
@@ skipping 105 matching lines @@
                            std::vector<PP_InputEvent>* pp_events) {
   const WebMouseWheelEvent& mouse_wheel_event =
       reinterpret_cast<const WebMouseWheelEvent&>(event);
   PP_InputEvent result = GetPPEventWithCommonFieldsAndType(event);
   result.u.wheel.modifier = mouse_wheel_event.modifiers;
   result.u.wheel.delta_x = mouse_wheel_event.deltaX;
   result.u.wheel.delta_y = mouse_wheel_event.deltaY;
   result.u.wheel.wheel_ticks_x = mouse_wheel_event.wheelTicksX;
   result.u.wheel.wheel_ticks_y = mouse_wheel_event.wheelTicksY;
   result.u.wheel.scroll_by_page =
-      pepper::BoolToPPBool(!!mouse_wheel_event.scrollByPage);
+      BoolToPPBool(!!mouse_wheel_event.scrollByPage);
   pp_events->push_back(result);
 }
 
-
 WebKeyboardEvent* BuildKeyEvent(const PP_InputEvent& event) {
   WebKeyboardEvent* key_event = new WebKeyboardEvent();
   switch (event.type) {
     case PP_INPUTEVENT_TYPE_RAWKEYDOWN:
       key_event->type = WebInputEvent::RawKeyDown;
       break;
     case PP_INPUTEVENT_TYPE_KEYDOWN:
       key_event->type = WebInputEvent::KeyDown;
       break;
     case PP_INPUTEVENT_TYPE_KEYUP:
@@ skipping 70 matching lines @@
   mouse_wheel_event->deltaX = event.u.wheel.delta_x;
   mouse_wheel_event->deltaY = event.u.wheel.delta_y;
   mouse_wheel_event->wheelTicksX = event.u.wheel.wheel_ticks_x;
   mouse_wheel_event->wheelTicksY = event.u.wheel.wheel_ticks_y;
   mouse_wheel_event->scrollByPage = event.u.wheel.scroll_by_page;
   return mouse_wheel_event;
 }
 
 }  // namespace
 
-namespace pepper {
-
 void CreatePPEvent(const WebInputEvent& event,
                    std::vector<PP_InputEvent>* pp_events) {
   pp_events->clear();
 
   switch (event.type) {
     case WebInputEvent::MouseDown:
     case WebInputEvent::MouseUp:
     case WebInputEvent::MouseMove:
     case WebInputEvent::MouseEnter:
     case WebInputEvent::MouseLeave:
@@ skipping 36 matching lines @@
     case PP_INPUTEVENT_TYPE_KEYUP:
       web_input_event.reset(BuildKeyEvent(event));
       break;
     case PP_INPUTEVENT_TYPE_CHAR:
       web_input_event.reset(BuildCharEvent(event));
       break;
   }
 
   return web_input_event.release();
 }
+}  // namespace ppapi
+}  // namespace webkit
 
-}  // namespace pepper