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/win/session_event_executor.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/win/session_event_executor.cc')
| -rw-r--r-- | remoting/host/win/session_event_executor.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/remoting/host/win/session_event_executor.cc b/remoting/host/win/session_event_executor.cc index 5afb41e..78121f1 100644 --- a/remoting/host/win/session_event_executor.cc +++ b/remoting/host/win/session_event_executor.cc @@ -13,8 +13,8 @@ #include "base/location.h" #include "base/single_thread_task_runner.h" #include "base/win/windows_version.h" -#include "remoting/capturer/win/desktop.h" -#include "remoting/capturer/win/scoped_thread_desktop.h" +#include "media/video/capture/screen/win/desktop.h" +#include "media/video/capture/screen/win/scoped_thread_desktop.h" #include "remoting/host/sas_injector.h" #include "remoting/proto/event.pb.h" @@ -80,7 +80,7 @@ class SessionEventExecutorWin::Core scoped_refptr<base::SingleThreadTaskRunner> inject_sas_task_runner_; - ScopedThreadDesktop desktop_; + media::ScopedThreadDesktop desktop_; // Used to inject Secure Attention Sequence on Vista+. base::Closure inject_sas_; @@ -182,7 +182,7 @@ SessionEventExecutorWin::Core::~Core() { void SessionEventExecutorWin::Core::SwitchToInputDesktop() { // Switch to the desktop receiving user input if different from the current // one. - scoped_ptr<Desktop> input_desktop = Desktop::GetInputDesktop(); + scoped_ptr<media::Desktop> input_desktop = media::Desktop::GetInputDesktop(); if (input_desktop.get() != NULL && !desktop_.IsSame(*input_desktop)) { // If SetThreadDesktop() fails, the thread is still assigned a desktop. // So we can continue capture screen bits, just from a diffected desktop. |