| Index: remoting/host/desktop_environment.cc
|
| diff --git a/remoting/host/desktop_environment.cc b/remoting/host/desktop_environment.cc
|
| index c13b8d506e6c10e2ac76fdddbfcffd2a9a57c20e..c62ac5871efca82067021b902c3f35a12cd211f9 100644
|
| --- a/remoting/host/desktop_environment.cc
|
| +++ b/remoting/host/desktop_environment.cc
|
| @@ -6,7 +6,7 @@
|
|
|
| #include "base/bind.h"
|
| #include "base/compiler_specific.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"
|
|
|
| @@ -19,7 +19,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());
|
| @@ -38,7 +38,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());
|
| @@ -64,7 +64,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) {
|
| return scoped_ptr<DesktopEnvironment>(
|
| new DesktopEnvironment(context,
|
| @@ -74,7 +74,7 @@ scoped_ptr<DesktopEnvironment> DesktopEnvironment::CreateFake(
|
|
|
| DesktopEnvironment::DesktopEnvironment(
|
| ChromotingHostContext* context,
|
| - scoped_ptr<Capturer> capturer,
|
| + scoped_ptr<VideoFrameCapturer> capturer,
|
| scoped_ptr<EventExecutor> event_executor)
|
| : context_(context),
|
| capturer_(capturer.Pass()),
|
|
|