Adding ability to stream windows and inject events to them

remoting/host/remoting_me2me_host.cc

Index: remoting/host/remoting_me2me_host.cc
diff --git a/remoting/host/remoting_me2me_host.cc b/remoting/host/remoting_me2me_host.cc
index 7ac8d09520354ff416dc4185a305de9585bdf537..afb0e03882355f2a23bd55d3c89445e618bd75d0 100644
--- a/remoting/host/remoting_me2me_host.cc
+++ b/remoting/host/remoting_me2me_host.cc
@@ -65,6 +65,7 @@
 #include "remoting/host/policy_hack/policy_watcher.h"
 #include "remoting/host/session_manager_factory.h"
 #include "remoting/host/signaling_connector.h"
+#include "remoting/host/single_window_desktop_environment.h"
 #include "remoting/host/token_validator_factory_impl.h"
 #include "remoting/host/usage_stats_consent.h"
 #include "remoting/host/username.h"
@@ -133,6 +134,8 @@ const char kFrameRecorderBufferKbName[] = "frame-recorder-buffer-kb";
 // from stdin.
 const char kStdinConfigPath[] = "-";
 
+const char kWindowIdSwitchName[] = "window-id";
+
 }  // namespace
 
 namespace remoting {
@@ -309,6 +312,13 @@ class HostProcess
   ThirdPartyAuthConfig third_party_auth_config_;
   bool enable_gnubby_auth_;
 
+  // Boolean to change flow, where ncessary, if we're
+  // capturing a window instead of the entire desktop.
+  bool enable_window_capture_;
+
+  // Used to specify which window to stream, if enabled.
+  webrtc::WindowId window_id_;
+
   scoped_ptr<OAuthTokenGetter> oauth_token_getter_;
   scoped_ptr<XmppSignalStrategy> signal_strategy_;
   scoped_ptr<SignalingConnector> signaling_connector_;
@@ -454,6 +464,29 @@ bool HostProcess::InitWithCommandLine(const base::CommandLine* cmd_line) {
 
   signal_parent_ = cmd_line->HasSwitch(kSignalParentSwitchName);
 
+  enable_window_capture_ = cmd_line->HasSwitch(kWindowIdSwitchName);
+  if (enable_window_capture_) {
+
+    #if defined(OS_LINUX)

[Sergey Ulanov, 2014/08/13 21:27:14]

#if doesn't need to be indented.

[ronakvora do not use, 2014/08/13 22:02:08]

Done.

+    LOG(WARNING) << "Window capturing is not fully supported on Linux.";
+    #endif  // defined(OS_LINUX)
+
+    #if defined(OS_WIN)

[Sergey Ulanov, 2014/08/13 21:27:14]

nit: No need to have two separate messages. It's better to use the same warning
for both platforms (just to make code simpler). Just replace "on Linux" with "on
Linux and Windows" in the message above.

[ronakvora do not use, 2014/08/13 22:02:08]

Done.

+    LOG(WARNING) << "Window capturing is not fully supported on Windows.";
+    #endif  // defined(OS_WIN)
+
+    // uint32_t is large enough to hold window IDs on all platforms.
+    uint32_t window_id;
+    if (base::StringToUint(
+            cmd_line->GetSwitchValueASCII(kWindowIdSwitchName),
+            &window_id)) {
+      window_id_ = static_cast<webrtc::WindowId>(window_id);
+    } else {
+      LOG(ERROR) << "Window with window id: " << window_id_
+                 << " not found. Shutting down host.";
+      return false;
+    }
+  }
   return true;
 }
 
@@ -684,11 +717,21 @@ void HostProcess::StartOnUiThread() {
           daemon_channel_.get());
   desktop_session_connector_ = desktop_environment_factory;
 #else  // !defined(OS_WIN)
-  DesktopEnvironmentFactory* desktop_environment_factory =
+  DesktopEnvironmentFactory* desktop_environment_factory;
+  if (enable_window_capture_) {
+    desktop_environment_factory =
+      new SingleWindowDesktopEnvironmentFactory(
+          context_->network_task_runner(),
+          context_->input_task_runner(),
+          context_->ui_task_runner(),
+          window_id_);
+  } else {
+    desktop_environment_factory =
       new Me2MeDesktopEnvironmentFactory(
           context_->network_task_runner(),
           context_->input_task_runner(),
           context_->ui_task_runner());
+  }
 #endif  // !defined(OS_WIN)
 
   desktop_environment_factory_.reset(desktop_environment_factory);