diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-28 23:54:03 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-28 23:54:03 +0000 |
| commit | 497d8a9857e7383f979b89694aff8dd403c176fe (patch) | |
| tree | 2f07bb42d4a7a8e94e959c90dacbfa62eed1debd /remoting/host/host_mock_objects.cc | |
| parent | bac4ae80a786d68bfc18ca46f0adfcc4a1c43b0f (diff) | |
| download | chromium_src-497d8a9857e7383f979b89694aff8dd403c176fe.zip chromium_src-497d8a9857e7383f979b89694aff8dd403c176fe.tar.gz chromium_src-497d8a9857e7383f979b89694aff8dd403c176fe.tar.bz2 | |
Move screen capturers from remoting/capturer to media/video/capturer/screen
Screen capturers will be used in content, and so they have to be moved to
avoid dependency on remoting/capturer in content.
Beside moving the files this CL also renames classes as follows:
remoting::VideoFrameCapturer -> media::ScreenCapturer
remoting::VideoFrame -> media::ScreenCaptureFrame
remoting::CaptureData -> media::ScreenCaptureData
BUG=134249
Review URL: https://codereview.chromium.org/12047101
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@179218 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host/host_mock_objects.cc')
| -rw-r--r-- | remoting/host/host_mock_objects.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/remoting/host/host_mock_objects.cc b/remoting/host/host_mock_objects.cc index 881683d..f8f1062 100644 --- a/remoting/host/host_mock_objects.cc +++ b/remoting/host/host_mock_objects.cc @@ -6,9 +6,9 @@ #include "base/message_loop_proxy.h" #include "base/single_thread_task_runner.h" +#include "media/video/capture/screen/screen_capturer.h" #include "net/base/ip_endpoint.h" #include "remoting/base/auto_thread_task_runner.h" -#include "remoting/capturer/video_frame_capturer.h" #include "remoting/codec/audio_encoder.h" #include "remoting/codec/video_encoder.h" #include "remoting/host/audio_capturer.h" @@ -34,10 +34,10 @@ scoped_ptr<EventExecutor> MockDesktopEnvironment::CreateEventExecutor( ui_task_runner)); } -scoped_ptr<VideoFrameCapturer> MockDesktopEnvironment::CreateVideoCapturer( +scoped_ptr<media::ScreenCapturer> MockDesktopEnvironment::CreateVideoCapturer( scoped_refptr<base::SingleThreadTaskRunner> capture_task_runner, scoped_refptr<base::SingleThreadTaskRunner> encode_task_runner) { - return scoped_ptr<VideoFrameCapturer>(CreateVideoCapturerPtr( + return scoped_ptr<media::ScreenCapturer>(CreateVideoCapturerPtr( capture_task_runner, encode_task_runner)); } |