Remote assistance on Chrome OS Part IV - It2MeHost

remoting/host/basic_desktop_environment.cc

Index: remoting/host/basic_desktop_environment.cc
diff --git a/remoting/host/basic_desktop_environment.cc b/remoting/host/basic_desktop_environment.cc
index 2cf80c5fd956e6e1b40b766c36a17763f542eecc..5b2164e39a654c434f63d557cf595d9a4c83ea0f 100644
--- a/remoting/host/basic_desktop_environment.cc
+++ b/remoting/host/basic_desktop_environment.cc
@@ -8,6 +8,9 @@
 #include "base/logging.h"
 #include "base/single_thread_task_runner.h"
 #include "remoting/host/audio_capturer.h"
+#if defined(OS_CHROMEOS)
+#include "remoting/host/chromeos/aura_desktop_capturer.h"
+#endif  // defined(OS_CHROMEOS)

[Wez, 2014/10/24 23:29:27]

nit: Don't need the trailing comment for a single-line #ifdef block

[kelvinp, 2014/10/29 01:22:51]

Done.

 #include "remoting/host/client_session_control.h"
 #include "remoting/host/gnubby_auth_handler.h"
 #include "remoting/host/input_injector.h"
@@ -62,10 +65,14 @@ scoped_ptr<webrtc::DesktopCapturer>
 BasicDesktopEnvironment::CreateVideoCapturer() {
   DCHECK(caller_task_runner_->BelongsToCurrentThread());
 
+#if defined(OS_CHROMEOS)
+  return scoped_ptr<webrtc::DesktopCapturer>(new AuraDesktopCapturer());
+#else  // !defined(OS_CHROMEOS)
   // The basic desktop environment does not use X DAMAGE, since it is
   // broken on many systems - see http://crbug.com/73423.
   return make_scoped_ptr(
       webrtc::ScreenCapturer::Create(*desktop_capture_options_));
+#endif  // !defined(OS_CHROMEOS)
 }
 
 BasicDesktopEnvironment::BasicDesktopEnvironment(