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

Side by Side Diff: talk/app/webrtc/java/jni/androidnetworkmonitor_jni.cc

Issue 1587193006: Move talk/media to webrtc/media (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rename back test to libjingle_media_unittest Created 4 years, 11 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * libjingle 2 * libjingle
3 * Copyright 2015 Google Inc. 3 * Copyright 2015 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 11 matching lines...) Expand all
22 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 22 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
23 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR 23 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF 24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28 #include "talk/app/webrtc/java/jni/androidnetworkmonitor_jni.h" 28 #include "talk/app/webrtc/java/jni/androidnetworkmonitor_jni.h"
29 29
30 #include <dlfcn.h> 30 #include <dlfcn.h>
31 31
32 #include "talk/app/webrtc/java/jni/classreferenceholder.h"
33 #include "talk/app/webrtc/java/jni/jni_helpers.h"
32 #include "webrtc/base/bind.h" 34 #include "webrtc/base/bind.h"
33 #include "webrtc/base/common.h" 35 #include "webrtc/base/common.h"
34 #include "webrtc/base/ipaddress.h" 36 #include "webrtc/base/ipaddress.h"
35 #include "talk/app/webrtc/java/jni/classreferenceholder.h"
36 #include "talk/app/webrtc/java/jni/jni_helpers.h"
37 37
38 namespace webrtc_jni { 38 namespace webrtc_jni {
39 39
40 jobject AndroidNetworkMonitor::application_context_ = nullptr; 40 jobject AndroidNetworkMonitor::application_context_ = nullptr;
41 41
42 static NetworkType GetNetworkTypeFromJava(JNIEnv* jni, jobject j_network_type) { 42 static NetworkType GetNetworkTypeFromJava(JNIEnv* jni, jobject j_network_type) {
43 std::string enum_name = 43 std::string enum_name =
44 GetJavaEnumName(jni, "org/webrtc/NetworkMonitorAutoDetect$ConnectionType", 44 GetJavaEnumName(jni, "org/webrtc/NetworkMonitorAutoDetect$ConnectionType",
45 j_network_type); 45 j_network_type);
46 if (enum_name == "CONNECTION_UNKNOWN") { 46 if (enum_name == "CONNECTION_UNKNOWN") {
(...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
287 JNIEnv* jni, jobject j_monitor, jlong j_native_monitor, 287 JNIEnv* jni, jobject j_monitor, jlong j_native_monitor,
288 jobject j_network_info) { 288 jobject j_network_info) {
289 AndroidNetworkMonitor* network_monitor = 289 AndroidNetworkMonitor* network_monitor =
290 reinterpret_cast<AndroidNetworkMonitor*>(j_native_monitor); 290 reinterpret_cast<AndroidNetworkMonitor*>(j_native_monitor);
291 NetworkInformation network_info = 291 NetworkInformation network_info =
292 GetNetworkInformationFromJava(jni, j_network_info); 292 GetNetworkInformationFromJava(jni, j_network_info);
293 network_monitor->OnNetworkAvailable(network_info); 293 network_monitor->OnNetworkAvailable(network_info);
294 } 294 }
295 295
296 } // namespace webrtc_jni 296 } // namespace webrtc_jni
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698