Revert 130500 - Merge 130082 - Add an injectKeyEvent API to the Chromoting client plugin.

remoting/client/plugin/chromoting_instance.cc

 // Copyright (c) 2012 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 "remoting/client/plugin/chromoting_instance.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 230 matching lines @@
     Disconnect();
   } else if (method == "incomingIq") {
     std::string iq;
     if (!data->GetString("iq", &iq)) {
       LOG(ERROR) << "Invalid onIq() data.";
       return;
     }
     OnIncomingIq(iq);
   } else if (method == "releaseAllKeys") {
     ReleaseAllKeys();
-  } else if (method == "injectKeyEvent") {
-    int usb_keycode = 0;
-    bool is_pressed = false;
-    if (!data->GetInteger("usb_keycode", &usb_keycode) ||
-        !data->GetBoolean("pressed", &is_pressed)) {
-      LOG(ERROR) << "Invalid injectKeyEvent.";
-      return;
-    }
-
-    protocol::KeyEvent event;
-    event.set_usb_keycode(usb_keycode);
-    event.set_pressed(is_pressed);
-    // Even though new hosts will ignore keycode, it's a required field.
-    event.set_keycode(0);
-    InjectKeyEvent(event);
   }
 }
 
 void ChromotingInstance::DidChangeView(const pp::Rect& position,
                                        const pp::Rect& clip) {
   DCHECK(plugin_message_loop_->BelongsToCurrentThread());
 
   SkISize new_size = SkISize::Make(position.width(), position.height());
   SkIRect new_clip =
     SkIRect::MakeXYWH(clip.x(), clip.y(), clip.width(), clip.height());
@@ skipping 122 matching lines @@
   host_connection_.reset();
 
   SetConnectionState(STATE_CLOSED, ERROR_NONE);
 }
 
 void ChromotingInstance::OnIncomingIq(const std::string& iq) {
   xmpp_proxy_->OnIq(iq);
 }
 
 void ChromotingInstance::ReleaseAllKeys() {
-  if (key_event_tracker_.get())
+  if (key_event_tracker_.get()) {
     key_event_tracker_->ReleaseAllKeys();
-}
-
-void ChromotingInstance::InjectKeyEvent(const protocol::KeyEvent& event) {
-  if (key_event_tracker_.get())
-    key_event_tracker_->InjectKeyEvent(event);
+  }
 }
 
 ChromotingStats* ChromotingInstance::GetStats() {
   if (!client_.get())
     return NULL;
   return client_->GetStats();
 }
 
 void ChromotingInstance::PostChromotingMessage(
     const std::string& method,
@@ skipping 130 matching lines @@
     scoped_ptr<base::DictionaryValue> data(new base::DictionaryValue());
     data->SetString("message", message);
     PostChromotingMessage("logDebugMessage", data.Pass());
 
     scriptable_object->LogDebugInfo(message);
   }
   g_logging_to_plugin = false;
 }
 
 }  // namespace remoting