diff options
| author | benwells@chromium.org <benwells@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-31 05:52:07 +0000 |
|---|---|---|
| committer | benwells@chromium.org <benwells@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-31 05:52:07 +0000 |
| commit | 68e103af1202ad37deaf6b4a23334cad0ec71f52 (patch) | |
| tree | c393fa5753420799c80f0e867b562d836ddaff7d /remoting/host/chromoting_param_traits.h | |
| parent | c0c789a71c85025325d2e3d95a0fbb277e34dbb5 (diff) | |
| download | chromium_src-68e103af1202ad37deaf6b4a23334cad0ec71f52.zip chromium_src-68e103af1202ad37deaf6b4a23334cad0ec71f52.tar.gz chromium_src-68e103af1202ad37deaf6b4a23334cad0ec71f52.tar.bz2 | |
Revert 248045 "Use webrtc::MouseCursorMonitor for cursor shapes"
> Use webrtc::MouseCursorMonitor for cursor shapes
>
> Use webrtc::MouseCursorMonitor for cursor shapes instead of
> webrtc::VideoFrameCapturer, in preparation for deprecating cursor shape
> functionality in the latter.
>
> BUG=324033
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=247689
>
> Review URL: https://codereview.chromium.org/92473002
This caused errors on a windows memory bot. See bug for details.
TBR=dcaiafa@chromium.org
Review URL: https://codereview.chromium.org/151163002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@248139 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host/chromoting_param_traits.h')
| -rw-r--r-- | remoting/host/chromoting_param_traits.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/remoting/host/chromoting_param_traits.h b/remoting/host/chromoting_param_traits.h index 35ca3bc..7925918 100644 --- a/remoting/host/chromoting_param_traits.h +++ b/remoting/host/chromoting_param_traits.h @@ -8,9 +8,7 @@ #include "ipc/ipc_message.h" #include "ipc/ipc_param_traits.h" #include "remoting/host/screen_resolution.h" -#include "third_party/webrtc/modules/desktop_capture/desktop_frame.h" #include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h" -#include "third_party/webrtc/modules/desktop_capture/mouse_cursor.h" namespace IPC { @@ -39,14 +37,6 @@ struct ParamTraits<webrtc::DesktopRect> { }; template <> -struct ParamTraits<webrtc::MouseCursor> { - typedef webrtc::MouseCursor param_type; - static void Write(Message* m, const param_type& p); - static bool Read(const Message* m, PickleIterator* iter, param_type* r); - static void Log(const param_type& p, std::string* l); -}; - -template <> struct ParamTraits<remoting::ScreenResolution> { typedef remoting::ScreenResolution param_type; static void Write(Message* m, const param_type& p); |