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

Unified Diff: remoting/host/host_mock_objects.h

Issue 11886051: Turned UiStrings into a singleton so that the continue window does not depend on ChromotingHost. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 7 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 | « remoting/host/disconnect_window_win.cc ('k') | remoting/host/host_mock_objects.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/host_mock_objects.h
diff --git a/remoting/host/host_mock_objects.h b/remoting/host/host_mock_objects.h
index 93ef0d696809a13251754715f2a3bdbef1fe971d..4ca939d5d92b61833e0ead61ac86d460cb40415f 100644
--- a/remoting/host/host_mock_objects.h
+++ b/remoting/host/host_mock_objects.h
@@ -14,7 +14,6 @@
#include "remoting/host/event_executor.h"
#include "remoting/host/host_status_observer.h"
#include "remoting/host/local_input_monitor.h"
-#include "remoting/host/ui_strings.h"
#include "remoting/proto/control.pb.h"
#include "testing/gmock/include/gmock/gmock.h"
@@ -55,8 +54,7 @@ class MockDisconnectWindow : public DisconnectWindow {
MockDisconnectWindow();
virtual ~MockDisconnectWindow();
- MOCK_METHOD3(Show, bool(const UiStrings& ui_strings,
- const base::Closure& disconnect_callback,
+ MOCK_METHOD2(Show, bool(const base::Closure& disconnect_callback,
const std::string& username));
MOCK_METHOD0(Hide, void());
};
@@ -76,8 +74,7 @@ class MockContinueWindow : public ContinueWindow {
MockContinueWindow();
virtual ~MockContinueWindow();
- MOCK_METHOD2(Show, void(
- remoting::ChromotingHost* host,
+ MOCK_METHOD1(Show, void(
const remoting::ContinueWindow::ContinueSessionCallback& callback));
MOCK_METHOD0(Hide, void());
};
« no previous file with comments | « remoting/host/disconnect_window_win.cc ('k') | remoting/host/host_mock_objects.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698