OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "webkit/plugins/ppapi/event_conversion.h" | 5 #include "webkit/plugins/ppapi/event_conversion.h" |
6 | 6 |
7 #include "base/basictypes.h" | 7 #include "base/basictypes.h" |
8 #include "base/i18n/char_iterator.h" | 8 #include "base/i18n/char_iterator.h" |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
11 #include "base/string_util.h" | 11 #include "base/string_util.h" |
12 #include "base/utf_string_conversions.h" | 12 #include "base/utf_string_conversions.h" |
13 #include "base/utf_string_conversion_utils.h" | 13 #include "base/utf_string_conversion_utils.h" |
14 #include "ppapi/c/pp_input_event.h" | 14 #include "ppapi/c/pp_input_event.h" |
15 #include "ppapi/shared_impl/input_event_impl.h" | 15 #include "ppapi/shared_impl/input_event_impl.h" |
| 16 // TODO(dmichael): Remove this include when PP_InputEvent is gone from m14. |
| 17 #include "ppapi/shared_impl/ppp_instance_combined.h" |
16 #include "ppapi/shared_impl/time_conversion.h" | 18 #include "ppapi/shared_impl/time_conversion.h" |
17 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" | 19 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" |
18 #include "webkit/plugins/ppapi/common.h" | 20 #include "webkit/plugins/ppapi/common.h" |
19 | 21 |
20 using ppapi::EventTimeToPPTimeTicks; | 22 using ppapi::EventTimeToPPTimeTicks; |
21 using ppapi::InputEventData; | 23 using ppapi::InputEventData; |
22 using ppapi::PPTimeTicksToEventTime; | 24 using ppapi::PPTimeTicksToEventTime; |
23 using WebKit::WebInputEvent; | 25 using WebKit::WebInputEvent; |
24 using WebKit::WebKeyboardEvent; | 26 using WebKit::WebKeyboardEvent; |
25 using WebKit::WebMouseEvent; | 27 using WebKit::WebMouseEvent; |
(...skipping 347 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
373 return PP_INPUTEVENT_CLASS_KEYBOARD; | 375 return PP_INPUTEVENT_CLASS_KEYBOARD; |
374 case WebInputEvent::Undefined: | 376 case WebInputEvent::Undefined: |
375 default: | 377 default: |
376 NOTREACHED(); | 378 NOTREACHED(); |
377 return PP_InputEvent_Class(0); | 379 return PP_InputEvent_Class(0); |
378 } | 380 } |
379 } | 381 } |
380 | 382 |
381 } // namespace ppapi | 383 } // namespace ppapi |
382 } // namespace webkit | 384 } // namespace webkit |
OLD | NEW |