| Index: remoting/client/jni/chromoting_jni_instance.h
|
| diff --git a/remoting/client/jni/chromoting_jni_instance.h b/remoting/client/jni/chromoting_jni_instance.h
|
| index 4ac7b1de80cd29b72af26a3f11189b789a6a5a07..2ce50e0046af33dbb058cf3e57441e8379f9e9be 100644
|
| --- a/remoting/client/jni/chromoting_jni_instance.h
|
| +++ b/remoting/client/jni/chromoting_jni_instance.h
|
| @@ -119,7 +119,8 @@ class ChromotingJniInstance
|
| ~ChromotingJniInstance() override;
|
|
|
| void ConnectToHostOnDisplayThread();
|
| - void ConnectToHostOnNetworkThread();
|
| + void ConnectToHostOnNetworkThread(
|
| + scoped_ptr<FrameConsumerProxy> frame_consumer);
|
| void DisconnectFromHostOnNetworkThread();
|
|
|
| // Notifies the user interface that the user needs to enter a PIN. The
|
| @@ -150,9 +151,8 @@ class ChromotingJniInstance
|
| std::string host_jid_;
|
|
|
| // This group of variables is to be used on the display thread.
|
| - scoped_refptr<FrameConsumerProxy> frame_consumer_;
|
| scoped_ptr<JniFrameConsumer> view_;
|
| - scoped_ptr<base::WeakPtrFactory<JniFrameConsumer> > view_weak_factory_;
|
| + scoped_ptr<base::WeakPtrFactory<JniFrameConsumer>> view_weak_factory_;
|
|
|
| // This group of variables is to be used on the network thread.
|
| scoped_ptr<ClientContext> client_context_;
|
|
|