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

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

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 14 matching lines...) Expand all
25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28 #ifndef TALK_APP_WEBRTC_JAVA_JNI_ANDROIDNETWORKMONITOR_JNI_H_ 28 #ifndef TALK_APP_WEBRTC_JAVA_JNI_ANDROIDNETWORKMONITOR_JNI_H_
29 #define TALK_APP_WEBRTC_JAVA_JNI_ANDROIDNETWORKMONITOR_JNI_H_ 29 #define TALK_APP_WEBRTC_JAVA_JNI_ANDROIDNETWORKMONITOR_JNI_H_
30 30
31 #include "webrtc/base/networkmonitor.h" 31 #include "webrtc/base/networkmonitor.h"
32 32
33 #include <map> 33 #include <map>
34 34
35 #include "talk/app/webrtc/java/jni/jni_helpers.h"
35 #include "webrtc/base/basictypes.h" 36 #include "webrtc/base/basictypes.h"
36 #include "webrtc/base/thread_checker.h" 37 #include "webrtc/base/thread_checker.h"
37 #include "talk/app/webrtc/java/jni/jni_helpers.h"
38 38
39 namespace webrtc_jni { 39 namespace webrtc_jni {
40 40
41 typedef uint32_t NetworkHandle; 41 typedef uint32_t NetworkHandle;
42 42
43 // c++ equivalent of java NetworkMonitorAutoDetect.ConnectionType. 43 // c++ equivalent of java NetworkMonitorAutoDetect.ConnectionType.
44 enum NetworkType { 44 enum NetworkType {
45 NETWORK_UNKNOWN, 45 NETWORK_UNKNOWN,
46 NETWORK_ETHERNET, 46 NETWORK_ETHERNET,
47 NETWORK_WIFI, 47 NETWORK_WIFI,
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 class AndroidNetworkMonitorFactory : public rtc::NetworkMonitorFactory { 93 class AndroidNetworkMonitorFactory : public rtc::NetworkMonitorFactory {
94 public: 94 public:
95 AndroidNetworkMonitorFactory() {} 95 AndroidNetworkMonitorFactory() {}
96 96
97 rtc::NetworkMonitorInterface* CreateNetworkMonitor() override; 97 rtc::NetworkMonitorInterface* CreateNetworkMonitor() override;
98 }; 98 };
99 99
100 } // namespace webrtc_jni 100 } // namespace webrtc_jni
101 101
102 #endif // TALK_APP_WEBRTC_JAVA_JNI_ANDROIDNETWORKMONITOR_JNI_H_ 102 #endif // TALK_APP_WEBRTC_JAVA_JNI_ANDROIDNETWORKMONITOR_JNI_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698