Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(124)

Unified Diff: trunk/src/remoting/host/host_mock_objects.h

Issue 151163002: Revert 248045 "Use webrtc::MouseCursorMonitor for cursor shapes" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « trunk/src/remoting/host/desktop_session_proxy.cc ('k') | trunk/src/remoting/host/host_mock_objects.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/remoting/host/host_mock_objects.h
===================================================================
--- trunk/src/remoting/host/host_mock_objects.h (revision 248137)
+++ trunk/src/remoting/host/host_mock_objects.h (working copy)
@@ -16,7 +16,6 @@
#include "remoting/host/screen_resolution.h"
#include "remoting/proto/control.pb.h"
#include "testing/gmock/include/gmock/gmock.h"
-#include "third_party/webrtc/modules/desktop_capture/mouse_cursor_monitor.h"
namespace base {
class SingleThreadTaskRunner;
@@ -33,7 +32,6 @@
MOCK_METHOD0(CreateInputInjectorPtr, InputInjector*());
MOCK_METHOD0(CreateScreenControlsPtr, ScreenControls*());
MOCK_METHOD0(CreateVideoCapturerPtr, webrtc::ScreenCapturer*());
- MOCK_METHOD0(CreateMouseCursorMonitorPtr, webrtc::MouseCursorMonitor*());
MOCK_CONST_METHOD0(GetCapabilities, std::string());
MOCK_METHOD1(SetCapabilities, void(const std::string&));
@@ -42,8 +40,6 @@
virtual scoped_ptr<InputInjector> CreateInputInjector() OVERRIDE;
virtual scoped_ptr<ScreenControls> CreateScreenControls() OVERRIDE;
virtual scoped_ptr<webrtc::ScreenCapturer> CreateVideoCapturer() OVERRIDE;
- virtual scoped_ptr<webrtc::MouseCursorMonitor> CreateMouseCursorMonitor()
- OVERRIDE;
};
class MockClientSessionControl : public ClientSessionControl {
@@ -130,18 +126,6 @@
MOCK_METHOD0(OnShutdown, void());
};
-class MockMouseCursorMonitor : public webrtc::MouseCursorMonitor {
- public:
- MockMouseCursorMonitor();
- virtual ~MockMouseCursorMonitor();
-
- MOCK_METHOD2(Init, void(Callback* callback, Mode mode));
- MOCK_METHOD0(Capture, void());
-
- private:
- DISALLOW_COPY_AND_ASSIGN(MockMouseCursorMonitor);
-};
-
} // namespace remoting
#endif // REMOTING_HOST_HOST_MOCK_OBJECTS_H_
« no previous file with comments | « trunk/src/remoting/host/desktop_session_proxy.cc ('k') | trunk/src/remoting/host/host_mock_objects.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698