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

3 files changed, 1 insertions, 20 deletions

diff --git a/ppapi/cpp/instance.cc b/ppapi/cpp/instance.cc
index 75e9a1f..9bb77dc 100644
--- a/ppapi/cpp/instance.cc
+++ b/ppapi/cpp/instance.cc
@@ -67,10 +67,6 @@ bool Instance::HandleDocumentLoad(const URLLoader& /*url_loader*/) {
   return false;
 }
 
-bool Instance::HandleInputEvent(const PP_InputEvent& /*event*/) {
-  return false;
-}
-
 bool Instance::HandleInputEvent(const InputEvent& /*event*/) {
   return false;
 }
diff --git a/ppapi/cpp/instance.h b/ppapi/cpp/instance.h
index abf441f..f08c2d5 100644
--- a/ppapi/cpp/instance.h
+++ b/ppapi/cpp/instance.h
@@ -154,10 +154,7 @@ class Instance {
   /// @param[in] event The input event.
   ///
   /// @return true if @a event was handled, false otherwise.
-  virtual bool HandleInputEvent(const PP_InputEvent& event);
-
-  /// @see InputEvent for an example
-  virtual bool HandleInputEvent(const InputEvent& event);
+  virtual bool HandleInputEvent(const pp::InputEvent& event);
 
   /// Notification of a data stream available after an instance was created
   /// based on the MIME type of a DOMWindow navigation. This only applies to
diff --git a/ppapi/cpp/module.cc b/ppapi/cpp/module.cc
index 927710a..b727e46 100644
--- a/ppapi/cpp/module.cc
+++ b/ppapi/cpp/module.cc
@@ -110,17 +110,6 @@ void Instance_DidChangeFocus(PP_Instance pp_instance, PP_Bool has_focus) {
   instance->DidChangeFocus(PP_ToBool(has_focus));
 }
 
-PP_Bool Instance_HandleInputEvent(PP_Instance pp_instance,
-                                  const PP_InputEvent* event) {
-  Module* module_singleton = Module::Get();
-  if (!module_singleton)
-    return PP_FALSE;
-  Instance* instance = module_singleton->InstanceForPPInstance(pp_instance);
-  if (!instance)
-    return PP_FALSE;
-  return PP_FromBool(instance->HandleInputEvent(*event));
-}
-
 PP_Bool Instance_HandleDocumentLoad(PP_Instance pp_instance,
                                     PP_Resource pp_url_loader) {
   Module* module_singleton = Module::Get();
@@ -137,7 +126,6 @@ static PPP_Instance instance_interface = {
   &Instance_DidDestroy,
   &Instance_DidChangeView,
   &Instance_DidChangeFocus,
-  &Instance_HandleInputEvent,
   &Instance_HandleDocumentLoad
 };