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

Unified Diff: remoting/host/host_mock_objects.h

Issue 12594009: Converted LocalInputMonitor into a SessionController instance. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Posting ClientSessionControl tasks directly since we have a weak point now. Created 7 years, 9 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
Index: remoting/host/host_mock_objects.h
diff --git a/remoting/host/host_mock_objects.h b/remoting/host/host_mock_objects.h
index 88928ff76df16d5c0f4e04780ebc2aea2e5fab28..ed145d5f73021f00c5b37b97dfc6ac4860ae687c 100644
--- a/remoting/host/host_mock_objects.h
+++ b/remoting/host/host_mock_objects.h
@@ -14,7 +14,6 @@
#include "remoting/host/disconnect_window.h"
#include "remoting/host/event_executor.h"
#include "remoting/host/host_status_observer.h"
-#include "remoting/host/local_input_monitor.h"
#include "remoting/host/screen_controls.h"
#include "remoting/host/screen_resolution.h"
#include "remoting/proto/control.pb.h"
@@ -53,16 +52,6 @@ class MockDisconnectWindow : public DisconnectWindow {
MOCK_METHOD0(Hide, void());
};
-class MockLocalInputMonitor : public LocalInputMonitor {
- public:
- MockLocalInputMonitor();
- virtual ~MockLocalInputMonitor();
-
- MOCK_METHOD2(Start, void(MouseMoveObserver* mouse_move_observer,
- const base::Closure& disconnect_callback));
- MOCK_METHOD0(Stop, void());
-};
-
class MockContinueWindow : public ContinueWindow {
public:
MockContinueWindow();
@@ -73,6 +62,20 @@ class MockContinueWindow : public ContinueWindow {
MOCK_METHOD0(Hide, void());
};
+class MockClientSessionControl : public ClientSessionControl {
+ public:
+ MockClientSessionControl();
+ virtual ~MockClientSessionControl();
+
+ MOCK_CONST_METHOD0(client_jid, const std::string&());
+ MOCK_METHOD0(DisconnectSession, void());
+ MOCK_METHOD1(OnLocalMouseMoved, void(const SkIPoint&));
+ MOCK_METHOD1(SetDisableInputs, void(bool));
+
+ private:
+ DISALLOW_COPY_AND_ASSIGN(MockClientSessionControl);
+};
+
class MockClientSessionEventHandler : public ClientSession::EventHandler {
public:
MockClientSessionEventHandler();

Powered by Google App Engine
This is Rietveld 408576698