Remote assistance on Chrome OS Part IV - It2MeHost

remoting/host/basic_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/basic_desktop_environment.h"
 
 #include "base/bind.h"
 #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)
 #include "remoting/host/client_session_control.h"
 #include "remoting/host/gnubby_auth_handler.h"
 #include "remoting/host/input_injector.h"
 #include "remoting/host/screen_controls.h"
 #include "third_party/webrtc/modules/desktop_capture/desktop_capture_options.h"
 #include "third_party/webrtc/modules/desktop_capture/mouse_cursor_monitor.h"
 #include "third_party/webrtc/modules/desktop_capture/screen_capturer.h"
 
 namespace remoting {
 
@@ skipping 34 matching lines @@
 
 scoped_ptr<GnubbyAuthHandler> BasicDesktopEnvironment::CreateGnubbyAuthHandler(
     protocol::ClientStub* client_stub) {
   return nullptr;
 }
 
 scoped_ptr<webrtc::DesktopCapturer>
 BasicDesktopEnvironment::CreateVideoCapturer() {
   DCHECK(caller_task_runner_->BelongsToCurrentThread());
 
+#if defined(OS_CHROMEOS)

[Jamie, 2014/10/14 01:18:41]

This doesn't feel like the right place for this ifdef. ScreenCapture::Create is
a per-platform static method; it feels like we should have a ChromeOS
implementation that returns an AuraDesktopCapturer, in which case this file
wouldn't need to be changed.

[kelvinp, 2014/10/15 23:03:09]

Done.

+  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(
     scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner,
     scoped_refptr<base::SingleThreadTaskRunner> input_task_runner,
     scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner)
     : caller_task_runner_(caller_task_runner),
       input_task_runner_(input_task_runner),
       ui_task_runner_(ui_task_runner),
       desktop_capture_options_(
@@ skipping 14 matching lines @@
 BasicDesktopEnvironmentFactory::~BasicDesktopEnvironmentFactory() {
 }
 
 bool BasicDesktopEnvironmentFactory::SupportsAudioCapture() const {
   DCHECK(caller_task_runner_->BelongsToCurrentThread());
 
   return AudioCapturer::IsSupported();
 }
 
 }  // namespace remoting