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

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

Issue 2969623003: Update includes for webrtc/{base => rtc_base} rename (2/3) (Closed)
Patch Set: Rebased onto 224e65939af87443addfc5bb500fbf434728bd1c and restored sorting in clock.cc Created 3 years, 5 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 * 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 #include "webrtc/sdk/android/src/jni/androidnetworkmonitor_jni.h" 11 #include "webrtc/sdk/android/src/jni/androidnetworkmonitor_jni.h"
12 12
13 #include <dlfcn.h> 13 #include <dlfcn.h>
14 // This was added in Lollipop to dlfcn.h 14 // This was added in Lollipop to dlfcn.h
15 #define RTLD_NOLOAD 4 15 #define RTLD_NOLOAD 4
16 16
17 #include "webrtc/rtc_base/bind.h"
18 #include "webrtc/rtc_base/checks.h"
19 #include "webrtc/rtc_base/ipaddress.h"
17 #include "webrtc/sdk/android/src/jni/classreferenceholder.h" 20 #include "webrtc/sdk/android/src/jni/classreferenceholder.h"
18 #include "webrtc/sdk/android/src/jni/jni_helpers.h" 21 #include "webrtc/sdk/android/src/jni/jni_helpers.h"
19 #include "webrtc/base/bind.h"
20 #include "webrtc/base/checks.h"
21 #include "webrtc/base/ipaddress.h"
22 22
23 namespace webrtc_jni { 23 namespace webrtc_jni {
24 24
25 enum AndroidSdkVersion { 25 enum AndroidSdkVersion {
26 SDK_VERSION_LOLLIPOP = 21, 26 SDK_VERSION_LOLLIPOP = 21,
27 SDK_VERSION_MARSHMALLOW = 23 27 SDK_VERSION_MARSHMALLOW = 23
28 }; 28 };
29 29
30 int AndroidNetworkMonitor::android_sdk_int_ = 0; 30 int AndroidNetworkMonitor::android_sdk_int_ = 0;
31 31
(...skipping 392 matching lines...) Expand 10 before | Expand all | Expand 10 after
424 JOW(void, NetworkMonitor_nativeNotifyOfNetworkDisconnect)( 424 JOW(void, NetworkMonitor_nativeNotifyOfNetworkDisconnect)(
425 JNIEnv* jni, jobject j_monitor, jlong j_native_monitor, 425 JNIEnv* jni, jobject j_monitor, jlong j_native_monitor,
426 jlong network_handle) { 426 jlong network_handle) {
427 AndroidNetworkMonitor* network_monitor = 427 AndroidNetworkMonitor* network_monitor =
428 reinterpret_cast<AndroidNetworkMonitor*>(j_native_monitor); 428 reinterpret_cast<AndroidNetworkMonitor*>(j_native_monitor);
429 network_monitor->OnNetworkDisconnected( 429 network_monitor->OnNetworkDisconnected(
430 static_cast<NetworkHandle>(network_handle)); 430 static_cast<NetworkHandle>(network_handle));
431 } 431 }
432 432
433 } // namespace webrtc_jni 433 } // namespace webrtc_jni
OLDNEW
« no previous file with comments | « webrtc/sdk/android/src/jni/androidnetworkmonitor_jni.h ('k') | webrtc/sdk/android/src/jni/androidvideotracksource.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698