Converted LocalInputMonitor into a SessionController instance.

remoting/host/me2me_desktop_environment.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/me2me_desktop_environment.h"
 
 #include "base/logging.h"
 #include "media/video/capture/screen/screen_capturer.h"
 #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 {
 
 Me2MeDesktopEnvironment::~Me2MeDesktopEnvironment() {
   DCHECK(caller_task_runner()->BelongsToCurrentThread());
 }
 
 scoped_ptr<SessionController>
 Me2MeDesktopEnvironment::CreateSessionController(
     const std::string& client_jid,
     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>
 Me2MeDesktopEnvironment::CreateVideoCapturer() {
   DCHECK(caller_task_runner()->BelongsToCurrentThread());
 
 #if defined(OS_LINUX)
   return media::ScreenCapturer::CreateWithXDamage(true);
 #else  // !defined(OS_LINUX)
   return media::ScreenCapturer::Create();
@@ skipping 25 matching lines @@
 scoped_ptr<DesktopEnvironment> Me2MeDesktopEnvironmentFactory::Create() {
   DCHECK(caller_task_runner()->BelongsToCurrentThread());
 
   return scoped_ptr<DesktopEnvironment>(
       new Me2MeDesktopEnvironment(caller_task_runner(),
                                   input_task_runner(),
                                   ui_task_runner()));
 }
 
 }  // namespace remoting