Switch DesktopEnvironment to return a DesktopCapturer.

remoting/host/shaped_desktop_capturer.h

Index: remoting/host/shaped_desktop_capturer.h
diff --git a/remoting/host/shaped_desktop_capturer.h b/remoting/host/shaped_desktop_capturer.h
new file mode 100644
index 0000000000000000000000000000000000000000..8653e91243bad3224cfab58af1d5504cbd85d84a
--- /dev/null
+++ b/remoting/host/shaped_desktop_capturer.h
@@ -0,0 +1,41 @@
+// Copyright 2013 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_SHAPED_DESKTOP_CAPTURER_H_
+#define REMOTING_HOST_SHAPED_DESKTOP_CAPTURER_H_
+
+#include "base/memory/scoped_ptr.h"
+#include "third_party/webrtc/modules/desktop_capture/desktop_capturer.h"
+
+namespace remoting {
+
+class DesktopShapeTracker;
+
+// Screen capturer that also captures desktop shape.
+class ShapedDesktopCapturer : public webrtc::DesktopCapturer,
+                              public webrtc::DesktopCapturer::Callback {
+ public:
+  ShapedDesktopCapturer(scoped_ptr<webrtc::DesktopCapturer> screen_capturer,
+                        scoped_ptr<DesktopShapeTracker> shape_tracker);
+  virtual ~ShapedDesktopCapturer();
+
+  // webrtc::DesktopCapturer interface.
+  virtual void Start(webrtc::DesktopCapturer::Callback* callback) OVERRIDE;
+  virtual void Capture(const webrtc::DesktopRegion& region) OVERRIDE;
+
+ private:
+  // webrtc::DesktopCapturer::Callback interface.
+  virtual webrtc::SharedMemory* CreateSharedMemory(size_t size) OVERRIDE;
+  virtual void OnCaptureCompleted(webrtc::DesktopFrame* frame) OVERRIDE;
+
+  scoped_ptr<webrtc::DesktopCapturer> desktop_capturer_;
+  scoped_ptr<DesktopShapeTracker> shape_tracker_;
+  webrtc::DesktopCapturer::Callback* callback_;
+
+  DISALLOW_COPY_AND_ASSIGN(ShapedDesktopCapturer);
+};
+
+}  // namespace remoting
+
+#endif  // REMOTING_HOST_SHAPED_DESKTOP_CAPTURER_H_