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

Unified Diff: remoting/host/session_event_executor_win.h

Issue 10837291: [Chromoting] Moving the daemon IPC channel to ChromotingHostContext. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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/session_event_executor_win.h
diff --git a/remoting/host/session_event_executor_win.h b/remoting/host/session_event_executor_win.h
index 8e18675c11280becd35933df7d7fa094da4f96fa..226365c24cf84b1d06d9e164d55dd6708e6cb0fe 100644
--- a/remoting/host/session_event_executor_win.h
+++ b/remoting/host/session_event_executor_win.h
@@ -10,7 +10,6 @@
#include "base/basictypes.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
-#include "ipc/ipc_channel.h"
#include "remoting/host/event_executor.h"
#include "remoting/host/win/scoped_thread_desktop.h"
@@ -24,12 +23,12 @@ class ChannelProxy;
namespace remoting {
-class SessionEventExecutorWin : public EventExecutor,
- public IPC::Listener {
+class SessionEventExecutorWin : public EventExecutor {
public:
+ // |daemon_channel| must outlive this object.
SessionEventExecutorWin(
scoped_refptr<base::SingleThreadTaskRunner> main_task_runner,
- scoped_refptr<base::SingleThreadTaskRunner> io_task_runner,
+ IPC::ChannelProxy* daemon_channel,
scoped_ptr<EventExecutor> nested_executor);
~SessionEventExecutorWin();
@@ -46,9 +45,6 @@ class SessionEventExecutorWin : public EventExecutor,
virtual void InjectKeyEvent(const protocol::KeyEvent& event) OVERRIDE;
virtual void InjectMouseEvent(const protocol::MouseEvent& event) OVERRIDE;
- // IPC::Listener implementation.
- virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
-
private:
// Switches to the desktop receiving a user input if different from
// the current one.
@@ -61,8 +57,8 @@ class SessionEventExecutorWin : public EventExecutor,
ScopedThreadDesktop desktop_;
- // The Chromoting IPC channel connecting the host with the service.
- scoped_ptr<IPC::ChannelProxy> chromoting_channel_;
+ // The IPC channel connecting us to the daemon process.
+ IPC::ChannelProxy* daemon_channel_;
// Keys currently pressed by the client, used to detect Ctrl-Alt-Del.
std::set<uint32> pressed_keys_;

Powered by Google App Engine
This is Rietveld 408576698