| Index: remoting/host/client_session.h
|
| diff --git a/remoting/host/client_session.h b/remoting/host/client_session.h
|
| index f0ab673e656cd9a06da760fb5b496a6a5fb31c22..6527481e733697f15873cce1d2626c0c120f3a7d 100644
|
| --- a/remoting/host/client_session.h
|
| +++ b/remoting/host/client_session.h
|
| @@ -35,6 +35,7 @@ class AudioEncoder;
|
| class AudioScheduler;
|
| struct ClientSessionTraits;
|
| class DesktopEnvironment;
|
| +class DesktopEnvironmentFactory;
|
| class ScreenRecorder;
|
| class VideoEncoder;
|
| class VideoFrameCapturer;
|
| @@ -85,12 +86,14 @@ class ClientSession
|
| virtual ~EventHandler() {}
|
| };
|
|
|
| + // |event_handler| must outlive |this|. |desktop_environment_factory| is only
|
| + // used by the constructor to create an instance of DesktopEnvironment.
|
| ClientSession(EventHandler* event_handler,
|
| scoped_refptr<base::SingleThreadTaskRunner> capture_task_runner,
|
| scoped_refptr<base::SingleThreadTaskRunner> encode_task_runner,
|
| scoped_refptr<base::SingleThreadTaskRunner> network_task_runner,
|
| scoped_ptr<protocol::ConnectionToClient> connection,
|
| - scoped_ptr<DesktopEnvironment> desktop_environment,
|
| + DesktopEnvironmentFactory* desktop_environment_factory,
|
| const base::TimeDelta& max_duration);
|
|
|
| // protocol::HostStub interface.
|
|
|