| Index: remoting/client/plugin/chromoting_instance.cc
|
| diff --git a/remoting/client/plugin/chromoting_instance.cc b/remoting/client/plugin/chromoting_instance.cc
|
| index fac4d753071068e458d5ef1d6b10bfbdcb0cbf25..4bef560473bffb94bc211a8cdd755b02f421e31a 100644
|
| --- a/remoting/client/plugin/chromoting_instance.cc
|
| +++ b/remoting/client/plugin/chromoting_instance.cc
|
| @@ -37,7 +37,7 @@
|
| #include "remoting/client/rectangle_update_decoder.h"
|
| #include "remoting/protocol/connection_to_host.h"
|
| #include "remoting/protocol/host_stub.h"
|
| -#include "remoting/protocol/key_event_tracker.h"
|
| +#include "remoting/protocol/input_event_tracker.h"
|
|
|
| // Windows defines 'PostMessage', so we have to undef it.
|
| #if defined(PostMessage)
|
| @@ -341,10 +341,10 @@ void ChromotingInstance::Connect(const ClientConfig& config) {
|
| mouse_input_filter_.reset(
|
| new MouseInputFilter(host_connection_->input_stub()));
|
| mouse_input_filter_->set_input_size(view_->get_view_size());
|
| - key_event_tracker_.reset(
|
| - new protocol::KeyEventTracker(mouse_input_filter_.get()));
|
| + input_tracker_.reset(
|
| + new protocol::InputEventTracker(mouse_input_filter_.get()));
|
| input_handler_.reset(
|
| - new PepperInputHandler(key_event_tracker_.get()));
|
| + new PepperInputHandler(input_tracker_.get()));
|
|
|
| LOG(INFO) << "Connecting to " << config.host_jid
|
| << ". Local jid: " << config.local_jid << ".";
|
| @@ -381,7 +381,7 @@ void ChromotingInstance::Disconnect() {
|
| }
|
|
|
| input_handler_.reset();
|
| - key_event_tracker_.reset();
|
| + input_tracker_.reset();
|
| mouse_input_filter_.reset();
|
| host_connection_.reset();
|
|
|
| @@ -393,8 +393,8 @@ void ChromotingInstance::OnIncomingIq(const std::string& iq) {
|
| }
|
|
|
| void ChromotingInstance::ReleaseAllKeys() {
|
| - if (key_event_tracker_.get()) {
|
| - key_event_tracker_->ReleaseAllKeys();
|
| + if (input_tracker_.get()) {
|
| + input_tracker_->ReleaseAll();
|
| }
|
| }
|
|
|
|
|