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

Unified Diff: remoting/host/me2me_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
Index: remoting/host/me2me_desktop_environment.cc
diff --git a/remoting/host/me2me_desktop_environment.cc b/remoting/host/me2me_desktop_environment.cc
index 841a9f681b3e37fc8de1d74aa87e9ffe6c9ed3fc..96c4aa12948bd6a654de227da2f44c70334bcbac 100644
--- a/remoting/host/me2me_desktop_environment.cc
+++ b/remoting/host/me2me_desktop_environment.cc
@@ -9,8 +9,10 @@
#include "remoting/host/audio_capturer.h"
#include "remoting/host/desktop_resizer.h"
#include "remoting/host/event_executor.h"
+#include "remoting/host/local_input_monitor.h"
#include "remoting/host/resizing_host_observer.h"
#include "remoting/host/session_controller.h"
+#include "remoting/host/session_controller_list.h"
namespace remoting {
@@ -24,9 +26,22 @@ Me2MeDesktopEnvironment::CreateSessionController(
SessionController::Delegate* delegate) {
DCHECK(caller_task_runner()->BelongsToCurrentThread());
- scoped_ptr<SessionController> session_controller(
+ scoped_ptr<SessionControllerList> controllers(new SessionControllerList());
+
+ // Create the session controller handling the resize-to-client events.
+ scoped_ptr<SessionController> resizing_host_observer(
new ResizingHostObserver(DesktopResizer::Create()));
- return session_controller.Pass();
+ controllers->AddController(resizing_host_observer.Pass());
+
+ // Create the local input monitor.
+ scoped_ptr<LocalInputMonitor> local_input_monitor =
+ LocalInputMonitor::Create(caller_task_runner(),
+ input_task_runner(),
+ ui_task_runner(),
+ delegate);
+ controllers->AddController(local_input_monitor.PassAs<SessionController>());
+
+ return controllers.PassAs<SessionController>();
}
scoped_ptr<media::ScreenCapturer>

Powered by Google App Engine
This is Rietveld 408576698