diff options
author | sergeyu <sergeyu@chromium.org> | 2015-02-13 10:45:30 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-02-13 18:46:39 +0000 |
commit | 1afb35a1a63e53497245625b1052be436830a95f (patch) | |
tree | 6510ec4213680732115ac7a8c2d642b1e41799de /remoting/host/client_session.h | |
parent | 0f2586fc1b71a03fa6a66aa5d7e1e9979d17a05c (diff) | |
download | chromium_src-1afb35a1a63e53497245625b1052be436830a95f.zip chromium_src-1afb35a1a63e53497245625b1052be436830a95f.tar.gz chromium_src-1afb35a1a63e53497245625b1052be436830a95f.tar.bz2 |
Cleanup VideoFramePump.
1. Threading logic for the capture thread has been moved to
ScreenCapturerProxy.
2. Mouse shape handling has been moved to MouseShapePump.
BUG=455818
Review URL: https://codereview.chromium.org/883673004
Cr-Commit-Position: refs/heads/master@{#316247}
Diffstat (limited to 'remoting/host/client_session.h')
-rw-r--r-- | remoting/host/client_session.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/remoting/host/client_session.h b/remoting/host/client_session.h index 05f8b7f..e4f79552 100644 --- a/remoting/host/client_session.h +++ b/remoting/host/client_session.h @@ -40,6 +40,7 @@ class AudioScheduler; class DesktopEnvironment; class DesktopEnvironmentFactory; class InputInjector; +class MouseShapePump; class ScreenControls; class VideoEncoder; class VideoFramePump; @@ -222,7 +223,8 @@ class ClientSession // |video_frame_pump_| may be nullptr if the video channel is not required - // see ResetVideoPipeline(). scoped_refptr<AudioScheduler> audio_scheduler_; - scoped_refptr<VideoFramePump> video_frame_pump_; + scoped_ptr<VideoFramePump> video_frame_pump_; + scoped_ptr<MouseShapePump> mouse_shape_pump_; // The set of all capabilities supported by the client. scoped_ptr<std::string> client_capabilities_; |