Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(867)

Side by Side Diff: webkit/plugins/ppapi/event_conversion.cc

Issue 7471006: Revert 93223 - Reland http://codereview.chromium.org/7452002/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « remoting/client/plugin/pepper_input_handler.cc ('k') | webkit/plugins/ppapi/plugin_module.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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"
18 #include "ppapi/shared_impl/time_conversion.h" 16 #include "ppapi/shared_impl/time_conversion.h"
19 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" 17 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
20 #include "webkit/plugins/ppapi/common.h" 18 #include "webkit/plugins/ppapi/common.h"
21 19
22 using ppapi::EventTimeToPPTimeTicks; 20 using ppapi::EventTimeToPPTimeTicks;
23 using ppapi::InputEventData; 21 using ppapi::InputEventData;
24 using ppapi::PPTimeTicksToEventTime; 22 using ppapi::PPTimeTicksToEventTime;
25 using WebKit::WebInputEvent; 23 using WebKit::WebInputEvent;
26 using WebKit::WebKeyboardEvent; 24 using WebKit::WebKeyboardEvent;
27 using WebKit::WebMouseEvent; 25 using WebKit::WebMouseEvent;
(...skipping 347 matching lines...) Expand 10 before | Expand all | Expand 10 after
375 return PP_INPUTEVENT_CLASS_KEYBOARD; 373 return PP_INPUTEVENT_CLASS_KEYBOARD;
376 case WebInputEvent::Undefined: 374 case WebInputEvent::Undefined:
377 default: 375 default:
378 NOTREACHED(); 376 NOTREACHED();
379 return PP_InputEvent_Class(0); 377 return PP_InputEvent_Class(0);
380 } 378 }
381 } 379 }
382 380
383 } // namespace ppapi 381 } // namespace ppapi
384 } // namespace webkit 382 } // namespace webkit
OLDNEW
« no previous file with comments | « remoting/client/plugin/pepper_input_handler.cc ('k') | webkit/plugins/ppapi/plugin_module.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698