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

Unified Diff: remoting/host/basic_desktop_environment.cc

Issue 12594009: Converted LocalInputMonitor into a SessionController instance. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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 | « no previous file | remoting/host/chromoting_host.h » ('j') | remoting/host/local_input_monitor.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/basic_desktop_environment.cc
diff --git a/remoting/host/basic_desktop_environment.cc b/remoting/host/basic_desktop_environment.cc
index a6fc99a26c61283a170e3a3f7f8321cbd1994a36..5274330a60f715fb972b927c66b2f4b0eba37705 100644
--- a/remoting/host/basic_desktop_environment.cc
+++ b/remoting/host/basic_desktop_environment.cc
@@ -8,6 +8,7 @@
#include "media/video/capture/screen/screen_capturer.h"
#include "remoting/host/audio_capturer.h"
#include "remoting/host/event_executor.h"
+#include "remoting/host/local_input_monitor.h"
#include "remoting/host/session_controller.h"
namespace remoting {
@@ -34,7 +35,13 @@ BasicDesktopEnvironment::CreateSessionController(
SessionController::Delegate* delegate) {
DCHECK(caller_task_runner_->BelongsToCurrentThread());
- return scoped_ptr<SessionController>();
+ // Create the local input monitor.
+ scoped_ptr<LocalInputMonitor> local_input_monitor =
+ LocalInputMonitor::Create(caller_task_runner_,
+ input_task_runner_,
+ ui_task_runner_,
+ delegate);
+ return local_input_monitor.PassAs<SessionController>();
}
scoped_ptr<media::ScreenCapturer>
« no previous file with comments | « no previous file | remoting/host/chromoting_host.h » ('j') | remoting/host/local_input_monitor.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698