Chromium Code Reviews| Index: remoting/client/jni/chromoting_jni_runtime.h |
| diff --git a/remoting/client/jni/chromoting_jni_runtime.h b/remoting/client/jni/chromoting_jni_runtime.h |
| index af2c4094c8e81df8b2bcbe5e7852af2b299d9618..1ceb45cdff55eceb25c7a00eed5d863eee87cfa0 100644 |
| --- a/remoting/client/jni/chromoting_jni_runtime.h |
| +++ b/remoting/client/jni/chromoting_jni_runtime.h |
| @@ -34,19 +34,19 @@ class ChromotingJniRuntime { |
| static ChromotingJniRuntime* GetInstance(); |
| scoped_refptr<AutoThreadTaskRunner> ui_task_runner() { |
| - return ui_task_runner_; |
| + return runtime_-ui_task_runner(); |
|
nicholss
2016/03/07 18:41:56
Doing this to be backwards compatible.
|
| } |
| scoped_refptr<AutoThreadTaskRunner> network_task_runner() { |
| - return network_task_runner_; |
| + return runtime_->network_task_runner(); |
| } |
| scoped_refptr<AutoThreadTaskRunner> display_task_runner() { |
| - return display_task_runner_; |
| + return runtime_->display_task_runner(); |
| } |
| scoped_refptr<net::URLRequestContextGetter> url_requester() { |
| - return url_requester_; |
| + return runtime_->url_requester(); |
| } |
| // Initiates a connection with the specified host. Only call when a host |
| @@ -126,15 +126,9 @@ class ChromotingJniRuntime { |
| // Detaches JVM from the current thread, then signals. Doesn't own |waiter|. |
| void DetachFromVmAndSignal(base::WaitableEvent* waiter); |
| - // Chromium code's connection to the Java message loop. |
| - scoped_ptr<base::MessageLoopForUI> ui_loop_; |
| - |
| - // References to native threads. |
| - scoped_refptr<AutoThreadTaskRunner> ui_task_runner_; |
| - scoped_refptr<AutoThreadTaskRunner> network_task_runner_; |
| - scoped_refptr<AutoThreadTaskRunner> display_task_runner_; |
| - |
| - scoped_refptr<net::URLRequestContextGetter> url_requester_; |
| + // Contains threads. |
| + // |
| + ChromotingClientRuntime* runtime_; |
| // Contains all connection-specific state. |
| scoped_refptr<ChromotingJniInstance> session_; |