Switch DesktopEnvironment to return a DesktopCapturer.

remoting/host/video_scheduler.h

 // 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.
 
 #ifndef REMOTING_HOST_VIDEO_SCHEDULER_H_
 #define REMOTING_HOST_VIDEO_SCHEDULER_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
 #include "remoting/codec/video_encoder.h"
 #include "remoting/host/capture_scheduler.h"
 #include "remoting/proto/video.pb.h"
+#include "third_party/webrtc/modules/desktop_capture/desktop_capturer.h"
 #include "third_party/webrtc/modules/desktop_capture/mouse_cursor_monitor.h"
-#include "third_party/webrtc/modules/desktop_capture/screen_capturer.h"
 
 namespace base {
 class SingleThreadTaskRunner;
 }  // namespace base
 
 namespace media {
-class ScreenCapturer;
+class DesktopCapturer;
 }  // namespace media
 
 namespace remoting {
 
 class CursorShapeInfo;
 
 namespace protocol {
 class CursorShapeInfo;
 class CursorShapeStub;
 class VideoStub;
 }  // namespace protocol
 
 // Class responsible for scheduling frame captures from a
-// webrtc::ScreenCapturer, delivering them to a VideoEncoder to encode, and
+// webrtc::DesktopCapturer, delivering them to a VideoEncoder to encode, and
 // finally passing the encoded video packets to the specified VideoStub to send
 // on the network.
 //
 // THREADING
 //
 // This class is supplied TaskRunners to use for capture, encode and network
 // operations.  Capture, encode and network transmission tasks are interleaved
 // as illustrated below:
 //
 // |       CAPTURE       ENCODE     NETWORK
@@ skipping 30 matching lines @@
   static void EnableTimestampsForTests();
 
   // Creates a VideoScheduler running capture, encode and network tasks on the
   // supplied TaskRunners.  Video and cursor shape updates will be pumped to
   // |video_stub| and |client_stub|, which must remain valid until Stop() is
   // called. |capturer| is used to capture frames.
   VideoScheduler(
       scoped_refptr<base::SingleThreadTaskRunner> capture_task_runner,
       scoped_refptr<base::SingleThreadTaskRunner> encode_task_runner,
       scoped_refptr<base::SingleThreadTaskRunner> network_task_runner,
-      scoped_ptr<webrtc::ScreenCapturer> capturer,
+      scoped_ptr<webrtc::DesktopCapturer> capturer,
       scoped_ptr<webrtc::MouseCursorMonitor> mouse_cursor_monitor,
       scoped_ptr<VideoEncoder> encoder,
       protocol::CursorShapeStub* cursor_stub,
       protocol::VideoStub* video_stub);
 
   // webrtc::DesktopCapturer::Callback implementation.
   virtual webrtc::SharedMemory* CreateSharedMemory(size_t size) OVERRIDE;
   virtual void OnCaptureCompleted(webrtc::DesktopFrame* frame) OVERRIDE;
 
   // webrtc::MouseCursorMonitor::Callback implementation.
@@ skipping 71 matching lines @@
 
   void EncodedDataAvailableCallback(int64 sequence_number,
                                     scoped_ptr<VideoPacket> packet);
 
   // Task runners used by this class.
   scoped_refptr<base::SingleThreadTaskRunner> capture_task_runner_;
   scoped_refptr<base::SingleThreadTaskRunner> encode_task_runner_;
   scoped_refptr<base::SingleThreadTaskRunner> network_task_runner_;
 
   // Used to capture frames. Always accessed on the capture thread.
-  scoped_ptr<webrtc::ScreenCapturer> capturer_;
+  scoped_ptr<webrtc::DesktopCapturer> capturer_;
 
   // Used to capture mouse cursor shapes. Always accessed on the capture thread.
   scoped_ptr<webrtc::MouseCursorMonitor> mouse_cursor_monitor_;
 
   // Used to encode captured frames. Always accessed on the encode thread.
   scoped_ptr<VideoEncoder> encoder_;
 
   // Interfaces through which video frames and cursor shapes are passed to the
   // client. These members are always accessed on the network thread.
   protocol::CursorShapeStub* cursor_stub_;
@@ skipping 25 matching lines @@
 
   // An object to schedule capturing.
   CaptureScheduler scheduler_;
 
   DISALLOW_COPY_AND_ASSIGN(VideoScheduler);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_HOST_VIDEO_SCHEDULER_H_