summaryrefslogtreecommitdiffstats
path: root/remoting/host/host_mock_objects.cc
diff options
context:
space:
mode:
authoralexeypa@chromium.org <alexeypa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-27 20:10:40 +0000
committeralexeypa@chromium.org <alexeypa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-27 20:10:40 +0000
commita031c970f7b7a36c417214bb4bbe3fd39af9b7f1 (patch)
tree20e43413645ff528ebd63b5d0e635d53c3206568 /remoting/host/host_mock_objects.cc
parent399ed423f1c7f84190a7030496ac76e9eaf945f6 (diff)
downloadchromium_src-a031c970f7b7a36c417214bb4bbe3fd39af9b7f1.zip
chromium_src-a031c970f7b7a36c417214bb4bbe3fd39af9b7f1.tar.gz
chromium_src-a031c970f7b7a36c417214bb4bbe3fd39af9b7f1.tar.bz2
Show the disconnect window and monitor the local mouse input when running the multiprocess host.
Supporting changes in this CL: - Desktop session agent now start only after receiving JID of the authenticated client. - The desktop process terminates if an unknown or unexpected message is received. BUG=134694 Review URL: https://chromiumcodereview.appspot.com/11512005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@174694 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host/host_mock_objects.cc')
-rw-r--r--remoting/host/host_mock_objects.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/remoting/host/host_mock_objects.cc b/remoting/host/host_mock_objects.cc
index cb4dddd..f9b6c52 100644
--- a/remoting/host/host_mock_objects.cc
+++ b/remoting/host/host_mock_objects.cc
@@ -18,9 +18,8 @@ MockDesktopEnvironmentFactory::MockDesktopEnvironmentFactory()
MockDesktopEnvironmentFactory::~MockDesktopEnvironmentFactory() {}
-scoped_ptr<DesktopEnvironment> MockDesktopEnvironmentFactory::Create(
- ClientSession* client) {
- return scoped_ptr<DesktopEnvironment>(CreatePtr(client));
+scoped_ptr<DesktopEnvironment> MockDesktopEnvironmentFactory::Create() {
+ return scoped_ptr<DesktopEnvironment>(CreatePtr());
}
MockEventExecutor::MockEventExecutor() {}