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

Unified Diff: remoting/client/plugin/chromoting_instance.cc

Issue 9465035: Move ClientSession's input logic into separate components. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase. Created 8 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/client/plugin/chromoting_instance.h ('k') | remoting/client/plugin/pepper_input_handler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/client/plugin/chromoting_instance.cc
diff --git a/remoting/client/plugin/chromoting_instance.cc b/remoting/client/plugin/chromoting_instance.cc
index 30e3c51366b8bf6ddc48cf63dcb9339bd080b753..7479ff92e61dec29e665b1912c68407e3e011d24 100644
--- a/remoting/client/plugin/chromoting_instance.cc
+++ b/remoting/client/plugin/chromoting_instance.cc
@@ -38,7 +38,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)
@@ -363,10 +363,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 << ".";
@@ -403,7 +403,7 @@ void ChromotingInstance::Disconnect() {
}
input_handler_.reset();
- key_event_tracker_.reset();
+ input_tracker_.reset();
mouse_input_filter_.reset();
host_connection_.reset();
@@ -415,13 +415,13 @@ 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();
}
void ChromotingInstance::InjectKeyEvent(const protocol::KeyEvent& event) {
- if (key_event_tracker_.get())
- key_event_tracker_->InjectKeyEvent(event);
+ if (input_tracker_.get())
+ input_tracker_->InjectKeyEvent(event);
}
void ChromotingInstance::SendClipboardItem(const std::string& mime_type,
« no previous file with comments | « remoting/client/plugin/chromoting_instance.h ('k') | remoting/client/plugin/pepper_input_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698