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

Side by Side Diff: webrtc/sdk/android/src/jni/androidnetworkmonitor_jni.h

Issue 2603203003: Revert of Replace basictypes.h with stdint.h for int_t types. (Closed)
Patch Set: Created 3 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
« no previous file with comments | « webrtc/pc/externalhmac.h ('k') | webrtc/system_wrappers/include/ntp_time.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2015 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2015 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #ifndef WEBRTC_SDK_ANDROID_SRC_JNI_ANDROIDNETWORKMONITOR_JNI_H_ 11 #ifndef WEBRTC_SDK_ANDROID_SRC_JNI_ANDROIDNETWORKMONITOR_JNI_H_
12 #define WEBRTC_SDK_ANDROID_SRC_JNI_ANDROIDNETWORKMONITOR_JNI_H_ 12 #define WEBRTC_SDK_ANDROID_SRC_JNI_ANDROIDNETWORKMONITOR_JNI_H_
13 13
14 #include "webrtc/base/networkmonitor.h" 14 #include "webrtc/base/networkmonitor.h"
15 15
16 #include <stdint.h>
17
18 #include <map> 16 #include <map>
19 17
20 #include "webrtc/sdk/android/src/jni/jni_helpers.h" 18 #include "webrtc/sdk/android/src/jni/jni_helpers.h"
19 #include "webrtc/base/basictypes.h"
21 #include "webrtc/base/thread_checker.h" 20 #include "webrtc/base/thread_checker.h"
22 21
23 namespace webrtc_jni { 22 namespace webrtc_jni {
24 23
25 typedef int64_t NetworkHandle; 24 typedef int64_t NetworkHandle;
26 25
27 // c++ equivalent of java NetworkMonitorAutoDetect.ConnectionType. 26 // c++ equivalent of java NetworkMonitorAutoDetect.ConnectionType.
28 enum NetworkType { 27 enum NetworkType {
29 NETWORK_UNKNOWN, 28 NETWORK_UNKNOWN,
30 NETWORK_ETHERNET, 29 NETWORK_ETHERNET,
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 class AndroidNetworkMonitorFactory : public rtc::NetworkMonitorFactory { 84 class AndroidNetworkMonitorFactory : public rtc::NetworkMonitorFactory {
86 public: 85 public:
87 AndroidNetworkMonitorFactory() {} 86 AndroidNetworkMonitorFactory() {}
88 87
89 rtc::NetworkMonitorInterface* CreateNetworkMonitor() override; 88 rtc::NetworkMonitorInterface* CreateNetworkMonitor() override;
90 }; 89 };
91 90
92 } // namespace webrtc_jni 91 } // namespace webrtc_jni
93 92
94 #endif // WEBRTC_SDK_ANDROID_SRC_JNI_ANDROIDNETWORKMONITOR_JNI_H_ 93 #endif // WEBRTC_SDK_ANDROID_SRC_JNI_ANDROIDNETWORKMONITOR_JNI_H_
OLDNEW
« no previous file with comments | « webrtc/pc/externalhmac.h ('k') | webrtc/system_wrappers/include/ntp_time.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698