Revert 248045 "Use webrtc::MouseCursorMonitor for cursor shapes"

trunk/src/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 "base/single_thread_task_runner.h"
 #include "remoting/host/client_session_control.h"
 #include "remoting/host/curtain_mode.h"
@@ skipping 20 matching lines @@
   DCHECK(caller_task_runner()->BelongsToCurrentThread());
 }
 
 scoped_ptr<ScreenControls> Me2MeDesktopEnvironment::CreateScreenControls() {
   DCHECK(caller_task_runner()->BelongsToCurrentThread());
 
   return scoped_ptr<ScreenControls>(
       new ResizingHostObserver(DesktopResizer::Create()));
 }
 
+scoped_ptr<webrtc::ScreenCapturer>
+Me2MeDesktopEnvironment::CreateVideoCapturer() {
+  DCHECK(caller_task_runner()->BelongsToCurrentThread());
+  webrtc::DesktopCaptureOptions options =
+      webrtc::DesktopCaptureOptions::CreateDefault();
+  options.set_use_update_notifications(true);
+  return scoped_ptr<webrtc::ScreenCapturer>(
+      webrtc::ScreenCapturer::Create(options));
+}
+
 std::string Me2MeDesktopEnvironment::GetCapabilities() const {
   return kRateLimitResizeRequests;
 }
 
 Me2MeDesktopEnvironment::Me2MeDesktopEnvironment(
     scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner,
     scoped_refptr<base::SingleThreadTaskRunner> input_task_runner,
     scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner)
     : BasicDesktopEnvironment(caller_task_runner,
                               input_task_runner,
                               ui_task_runner) {
   DCHECK(caller_task_runner->BelongsToCurrentThread());
-  desktop_capture_options()->set_use_update_notifications(true);
 }
 
 bool Me2MeDesktopEnvironment::InitializeSecurity(
     base::WeakPtr<ClientSessionControl> client_session_control,
     bool curtain_enabled) {
   DCHECK(caller_task_runner()->BelongsToCurrentThread());
 
   // Detach the session from the local console if the caller requested.
   if (curtain_enabled) {
     curtain_ = CurtainMode::Create(caller_task_runner(),
@@ skipping 71 matching lines @@
   return desktop_environment.PassAs<DesktopEnvironment>();
 }
 
 void Me2MeDesktopEnvironmentFactory::SetEnableCurtaining(bool enable) {
   DCHECK(caller_task_runner()->BelongsToCurrentThread());
 
   curtain_enabled_ = enable;
 }
 
 }  // namespace remoting