Rename EventExecutor to InputInjector.

remoting/host/client_session.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/host/client_session.h"
 
 #include <algorithm>
 
 #include "base/message_loop_proxy.h"
 #include "media/video/capture/screen/screen_capturer.h"
 #include "remoting/codec/audio_encoder.h"
 #include "remoting/codec/audio_encoder_opus.h"
 #include "remoting/codec/audio_encoder_speex.h"
 #include "remoting/codec/audio_encoder_verbatim.h"
 #include "remoting/codec/video_encoder.h"
 #include "remoting/codec/video_encoder_verbatim.h"
 #include "remoting/codec/video_encoder_vp8.h"
 #include "remoting/host/audio_capturer.h"
 #include "remoting/host/audio_scheduler.h"
 #include "remoting/host/desktop_environment.h"
-#include "remoting/host/event_executor.h"
+#include "remoting/host/input_injector.h"
 #include "remoting/host/screen_resolution.h"
 #include "remoting/host/session_controller.h"
 #include "remoting/host/video_scheduler.h"
 #include "remoting/proto/control.pb.h"
 #include "remoting/proto/event.pb.h"
 #include "remoting/protocol/client_stub.h"
 #include "remoting/protocol/clipboard_thread_proxy.h"
 
 // Default DPI to assume for old clients that use notifyClientDimensions.
 const int kDefaultDPI = 96;
@@ skipping 47 matching lines @@
 #if defined(OS_WIN)
   // LocalInputMonitorWin filters out an echo of the injected input before it
   // reaches |remote_input_filter_|.
   remote_input_filter_.SetExpectLocalEcho(false);
 #endif  // defined(OS_WIN)
 }
 
 ClientSession::~ClientSession() {
   DCHECK(CalledOnValidThread());
   DCHECK(!audio_scheduler_);
-  DCHECK(!event_executor_);
+  DCHECK(!input_injector_);
   DCHECK(!session_controller_);
   DCHECK(!video_scheduler_);
 
   connection_.reset();
 }
 
 void ClientSession::NotifyClientResolution(
     const protocol::ClientResolution& resolution) {
   if (!resolution.has_dips_width() || !resolution.has_dips_height())
     return;
@@ skipping 51 matching lines @@
   }
 
   event_handler_->OnSessionAuthenticated(this);
 }
 
 void ClientSession::OnConnectionChannelsConnected(
     protocol::ConnectionToClient* connection) {
   DCHECK(CalledOnValidThread());
   DCHECK_EQ(connection_.get(), connection);
   DCHECK(!audio_scheduler_);
-  DCHECK(!event_executor_);
+  DCHECK(!input_injector_);
   DCHECK(!session_controller_);
   DCHECK(!video_scheduler_);
 
   scoped_ptr<DesktopEnvironment> desktop_environment =
       desktop_environment_factory_->Create(
           client_jid_,
           base::Bind(&protocol::ConnectionToClient::Disconnect,
                      connection_factory_.GetWeakPtr()));
 
   // Create the session controller.
   session_controller_ = desktop_environment->CreateSessionController();
 
   // Create and start the event executor.
-  event_executor_ = desktop_environment->CreateEventExecutor(
+  input_injector_ = desktop_environment->CreateInputInjector(
       input_task_runner_, ui_task_runner_);
-  event_executor_->Start(CreateClipboardProxy());
+  input_injector_->Start(CreateClipboardProxy());
 
   // Connect the host clipboard and input stubs.
-  host_input_filter_.set_input_stub(event_executor_.get());
-  clipboard_echo_filter_.set_host_stub(event_executor_.get());
+  host_input_filter_.set_input_stub(input_injector_.get());
+  clipboard_echo_filter_.set_host_stub(input_injector_.get());
 
   SetDisableInputs(false);
 
   // Create a VideoEncoder based on the session's video channel configuration.
   scoped_ptr<VideoEncoder> video_encoder =
       CreateVideoEncoder(connection_->session()->config());
 
   // Create a VideoScheduler to pump frames from the capturer to the client.
   video_scheduler_ = VideoScheduler::Create(
       video_capture_task_runner_,
@@ skipping 48 matching lines @@
   if (audio_scheduler_) {
     audio_scheduler_->Stop();
     audio_scheduler_ = NULL;
   }
   if (video_scheduler_) {
     video_scheduler_->Stop();
     video_scheduler_ = NULL;
   }
 
   client_clipboard_factory_.InvalidateWeakPtrs();
-  event_executor_.reset();
+  input_injector_.reset();
   session_controller_.reset();
 
   // Notify the ChromotingHost that this client is disconnected.
   // TODO(sergeyu): Log failure reason?
   event_handler_->OnSessionClosed(this);
 }
 
 void ClientSession::OnSequenceNumberUpdated(
     protocol::ConnectionToClient* connection, int64 sequence_number) {
   DCHECK(CalledOnValidThread());
@@ skipping 76 matching lines @@
     return scoped_ptr<AudioEncoder>(new AudioEncoderSpeex());
   } else if (audio_config.codec == protocol::ChannelConfig::CODEC_OPUS) {
     return scoped_ptr<AudioEncoder>(new AudioEncoderOpus());
   }
 
   NOTIMPLEMENTED();
   return scoped_ptr<AudioEncoder>(NULL);
 }
 
 }  // namespace remoting