| Index: remoting/host/desktop_environment.cc
|
| diff --git a/remoting/host/desktop_environment.cc b/remoting/host/desktop_environment.cc
|
| index 25016c87fae3e0fca70cc85c54cd72cd822ae4f2..7f782de0c7c2ed7be9ddd33999643d8f1385cc24 100644
|
| --- a/remoting/host/desktop_environment.cc
|
| +++ b/remoting/host/desktop_environment.cc
|
| @@ -7,7 +7,7 @@
|
| #include "base/bind.h"
|
| #include "base/compiler_specific.h"
|
| #include "remoting/host/audio_capturer.h"
|
| -#include "remoting/host/capturer.h"
|
| +#include "remoting/host/video_frame_capturer.h"
|
| #include "remoting/host/chromoting_host_context.h"
|
| #include "remoting/host/event_executor.h"
|
|
|
| @@ -20,7 +20,7 @@ namespace remoting {
|
| // static
|
| scoped_ptr<DesktopEnvironment> DesktopEnvironment::Create(
|
| ChromotingHostContext* context) {
|
| - scoped_ptr<Capturer> capturer(Capturer::Create());
|
| + scoped_ptr<VideoFrameCapturer> capturer(VideoFrameCapturer::Create());
|
| scoped_ptr<EventExecutor> event_executor = EventExecutor::Create(
|
| context->desktop_task_runner(), context->ui_task_runner(),
|
| capturer.get());
|
| @@ -41,7 +41,7 @@ scoped_ptr<DesktopEnvironment> DesktopEnvironment::Create(
|
| // static
|
| scoped_ptr<DesktopEnvironment> DesktopEnvironment::CreateForService(
|
| ChromotingHostContext* context) {
|
| - scoped_ptr<Capturer> capturer(Capturer::Create());
|
| + scoped_ptr<VideoFrameCapturer> capturer(VideoFrameCapturer::Create());
|
| scoped_ptr<EventExecutor> event_executor = EventExecutor::Create(
|
| context->desktop_task_runner(), context->ui_task_runner(),
|
| capturer.get());
|
| @@ -69,7 +69,7 @@ scoped_ptr<DesktopEnvironment> DesktopEnvironment::CreateForService(
|
| // static
|
| scoped_ptr<DesktopEnvironment> DesktopEnvironment::CreateFake(
|
| ChromotingHostContext* context,
|
| - scoped_ptr<Capturer> capturer,
|
| + scoped_ptr<VideoFrameCapturer> capturer,
|
| scoped_ptr<EventExecutor> event_executor,
|
| scoped_ptr<AudioCapturer> audio_capturer) {
|
| return scoped_ptr<DesktopEnvironment>(
|
| @@ -81,7 +81,7 @@ scoped_ptr<DesktopEnvironment> DesktopEnvironment::CreateFake(
|
|
|
| DesktopEnvironment::DesktopEnvironment(
|
| ChromotingHostContext* context,
|
| - scoped_ptr<Capturer> capturer,
|
| + scoped_ptr<VideoFrameCapturer> capturer,
|
| scoped_ptr<EventExecutor> event_executor,
|
| scoped_ptr<AudioCapturer> audio_capturer)
|
| : context_(context),
|
|
|