| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "remoting/client/jni/chromoting_jni_runtime.h" | 5 #include "remoting/client/jni/chromoting_jni_runtime.h" |
| 6 | 6 |
| 7 #include "base/android/jni_android.h" | 7 #include "base/android/jni_android.h" |
| 8 #include "base/android/jni_array.h" | 8 #include "base/android/jni_array.h" |
| 9 #include "base/android/jni_string.h" | 9 #include "base/android/jni_string.h" |
| 10 #include "base/android/library_loader/library_loader_hooks.h" | 10 #include "base/android/library_loader/library_loader_hooks.h" |
| (...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 87 runtime_ = ChromotingClientRuntime::Create(ui_loop_.get()); | 87 runtime_ = ChromotingClientRuntime::Create(ui_loop_.get()); |
| 88 network_task_runner()->PostTask( | 88 network_task_runner()->PostTask( |
| 89 FROM_HERE, base::Bind(&ChromotingJniRuntime::StartLoggerOnNetworkThread, | 89 FROM_HERE, base::Bind(&ChromotingJniRuntime::StartLoggerOnNetworkThread, |
| 90 base::Unretained(this))); | 90 base::Unretained(this))); |
| 91 } | 91 } |
| 92 | 92 |
| 93 ChromotingJniRuntime::~ChromotingJniRuntime() { | 93 ChromotingJniRuntime::~ChromotingJniRuntime() { |
| 94 // The singleton should only ever be destroyed on the main thread. | 94 // The singleton should only ever be destroyed on the main thread. |
| 95 DCHECK(ui_task_runner()->BelongsToCurrentThread()); | 95 DCHECK(ui_task_runner()->BelongsToCurrentThread()); |
| 96 | 96 |
| 97 base::WaitableEvent done_event(false, false); | 97 base::WaitableEvent done_event( |
| 98 base::WaitableEvent::ResetPolicy::AUTOMATIC, |
| 99 base::WaitableEvent::InitialState::NOT_SIGNALED); |
| 98 network_task_runner()->PostTask( | 100 network_task_runner()->PostTask( |
| 99 FROM_HERE, base::Bind(&ChromotingJniRuntime::DetachFromVmAndSignal, | 101 FROM_HERE, base::Bind(&ChromotingJniRuntime::DetachFromVmAndSignal, |
| 100 base::Unretained(this), &done_event)); | 102 base::Unretained(this), &done_event)); |
| 101 done_event.Wait(); | 103 done_event.Wait(); |
| 102 display_task_runner()->PostTask( | 104 display_task_runner()->PostTask( |
| 103 FROM_HERE, base::Bind(&ChromotingJniRuntime::DetachFromVmAndSignal, | 105 FROM_HERE, base::Bind(&ChromotingJniRuntime::DetachFromVmAndSignal, |
| 104 base::Unretained(this), &done_event)); | 106 base::Unretained(this), &done_event)); |
| 105 done_event.Wait(); | 107 done_event.Wait(); |
| 106 base::android::LibraryLoaderExitHook(); | 108 base::android::LibraryLoaderExitHook(); |
| 107 base::android::DetachFromVM(); | 109 base::android::DetachFromVM(); |
| (...skipping 22 matching lines...) Expand all Loading... |
| 130 logger_->Start( | 132 logger_->Start( |
| 131 base::WrapUnique( | 133 base::WrapUnique( |
| 132 new ChromiumUrlRequestFactory(runtime_->url_requester())), | 134 new ChromiumUrlRequestFactory(runtime_->url_requester())), |
| 133 kTelemetryBaseUrl); | 135 kTelemetryBaseUrl); |
| 134 logger_->SetAuthClosure( | 136 logger_->SetAuthClosure( |
| 135 base::Bind(&ChromotingJniRuntime::FetchAuthToken, | 137 base::Bind(&ChromotingJniRuntime::FetchAuthToken, |
| 136 base::Unretained(this))); | 138 base::Unretained(this))); |
| 137 } | 139 } |
| 138 | 140 |
| 139 } // namespace remoting | 141 } // namespace remoting |
| OLD | NEW |