Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / remoting / host / basic_desktop_environment.cc

diff --git a/src/remoting/host/basic_desktop_environment.cc b/src/remoting/host/basic_desktop_environment.cc
index f821d59..a5398bb 100644 (file)
--- a/src/remoting/host/basic_desktop_environment.cc
+++ b/src/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
 #include "remoting/host/client_session_control.h"
 #include "remoting/host/gnubby_auth_handler.h"
 #include "remoting/host/input_injector.h"
@@ -37,15 +40,13 @@ scoped_ptr<InputInjector> BasicDesktopEnvironment::CreateInputInjector() {
 scoped_ptr<ScreenControls> BasicDesktopEnvironment::CreateScreenControls() {
   DCHECK(caller_task_runner_->BelongsToCurrentThread());
 
-  return scoped_ptr<ScreenControls>();
+  return nullptr;
 }
 
 scoped_ptr<webrtc::MouseCursorMonitor>
 BasicDesktopEnvironment::CreateMouseCursorMonitor() {
-  return scoped_ptr<webrtc::MouseCursorMonitor>(
-      webrtc::MouseCursorMonitor::CreateForScreen(
-          *desktop_capture_options_,
-          webrtc::kFullDesktopScreenId));
+  return make_scoped_ptr(webrtc::MouseCursorMonitor::CreateForScreen(
+      *desktop_capture_options_, webrtc::kFullDesktopScreenId));
 }
 
 std::string BasicDesktopEnvironment::GetCapabilities() const {
@@ -57,17 +58,21 @@ void BasicDesktopEnvironment::SetCapabilities(const std::string& capabilities) {
 
 scoped_ptr<GnubbyAuthHandler> BasicDesktopEnvironment::CreateGnubbyAuthHandler(
     protocol::ClientStub* client_stub) {
-  return scoped_ptr<GnubbyAuthHandler>();
+  return nullptr;
 }
 
 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 scoped_ptr<webrtc::DesktopCapturer>(
+  return make_scoped_ptr(
       webrtc::ScreenCapturer::Create(*desktop_capture_options_));
+#endif  // !defined(OS_CHROMEOS)
 }
 
 BasicDesktopEnvironment::BasicDesktopEnvironment(