diff options
author | dmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-20 19:55:39 +0000 |
---|---|---|
committer | dmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-20 19:55:39 +0000 |
commit | 13a8f498151ac4e1e771cb3d70d56f38848be04a (patch) | |
tree | a751efce3637a6705caf9dd526574855e0fc09c8 /webkit/plugins/ppapi/event_conversion.cc | |
parent | 40e67ab32b12fbcbbbca4cd0764c9796918e82ae (diff) | |
download | chromium_src-13a8f498151ac4e1e771cb3d70d56f38848be04a.zip chromium_src-13a8f498151ac4e1e771cb3d70d56f38848be04a.tar.gz chromium_src-13a8f498151ac4e1e771cb3d70d56f38848be04a.tar.bz2 |
Reland http://codereview.chromium.org/7452002/ again
Update chromoting input events. (Clang caught this. Thanks, Clang!)
Note I'm leaving in temporary backwards-compatibility.
BUG=None
TEST=ppapi tests
TBR=brettw,sergeyu
Review URL: http://codereview.chromium.org/7466008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93234 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/plugins/ppapi/event_conversion.cc')
-rw-r--r-- | webkit/plugins/ppapi/event_conversion.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/webkit/plugins/ppapi/event_conversion.cc b/webkit/plugins/ppapi/event_conversion.cc index 41db456c..d09faef 100644 --- a/webkit/plugins/ppapi/event_conversion.cc +++ b/webkit/plugins/ppapi/event_conversion.cc @@ -13,6 +13,8 @@ #include "base/utf_string_conversion_utils.h" #include "ppapi/c/pp_input_event.h" #include "ppapi/shared_impl/input_event_impl.h" +// TODO(dmichael): Remove this include when PP_InputEvent is gone from m14. +#include "ppapi/shared_impl/ppp_instance_combined.h" #include "ppapi/shared_impl/time_conversion.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" #include "webkit/plugins/ppapi/common.h" |