| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "net/android/network_change_notifier_delegate_android.h" | 5 #include "net/android/network_change_notifier_delegate_android.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "jni/NetworkChangeNotifier_jni.h" | 8 #include "jni/NetworkChangeNotifier_jni.h" |
| 9 #include "net/android/network_change_notifier_android.h" | 9 #include "net/android/network_change_notifier_android.h" |
| 10 | 10 |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 57 java_network_change_notifier_.Reset( | 57 java_network_change_notifier_.Reset( |
| 58 Java_NetworkChangeNotifier_init( | 58 Java_NetworkChangeNotifier_init( |
| 59 env, base::android::GetApplicationContext())); | 59 env, base::android::GetApplicationContext())); |
| 60 Java_NetworkChangeNotifier_addNativeObserver( | 60 Java_NetworkChangeNotifier_addNativeObserver( |
| 61 env, java_network_change_notifier_.obj(), | 61 env, java_network_change_notifier_.obj(), |
| 62 reinterpret_cast<intptr_t>(this)); | 62 reinterpret_cast<intptr_t>(this)); |
| 63 SetCurrentConnectionType( | 63 SetCurrentConnectionType( |
| 64 ConvertConnectionType( | 64 ConvertConnectionType( |
| 65 Java_NetworkChangeNotifier_getCurrentConnectionType( | 65 Java_NetworkChangeNotifier_getCurrentConnectionType( |
| 66 env, java_network_change_notifier_.obj()))); | 66 env, java_network_change_notifier_.obj()))); |
| 67 SetCurrentMaxBandwidth(Java_NetworkChangeNotifier_getCurrentMaxBandwidth( | 67 SetCurrentMaxBandwidth( |
| 68 env, java_network_change_notifier_.obj())); | 68 Java_NetworkChangeNotifier_getCurrentMaxBandwidthInMbps( |
| 69 env, java_network_change_notifier_.obj())); |
| 69 } | 70 } |
| 70 | 71 |
| 71 NetworkChangeNotifierDelegateAndroid::~NetworkChangeNotifierDelegateAndroid() { | 72 NetworkChangeNotifierDelegateAndroid::~NetworkChangeNotifierDelegateAndroid() { |
| 72 DCHECK(thread_checker_.CalledOnValidThread()); | 73 DCHECK(thread_checker_.CalledOnValidThread()); |
| 73 observers_->AssertEmpty(); | 74 observers_->AssertEmpty(); |
| 74 JNIEnv* env = base::android::AttachCurrentThread(); | 75 JNIEnv* env = base::android::AttachCurrentThread(); |
| 75 Java_NetworkChangeNotifier_removeNativeObserver( | 76 Java_NetworkChangeNotifier_removeNativeObserver( |
| 76 env, java_network_change_notifier_.obj(), | 77 env, java_network_change_notifier_.obj(), |
| 77 reinterpret_cast<intptr_t>(this)); | 78 reinterpret_cast<intptr_t>(this)); |
| 78 } | 79 } |
| (...skipping 10 matching lines...) Expand all Loading... |
| 89 } | 90 } |
| 90 | 91 |
| 91 void NetworkChangeNotifierDelegateAndroid::NotifyConnectionTypeChanged( | 92 void NetworkChangeNotifierDelegateAndroid::NotifyConnectionTypeChanged( |
| 92 JNIEnv* env, | 93 JNIEnv* env, |
| 93 jobject obj, | 94 jobject obj, |
| 94 jint new_connection_type) { | 95 jint new_connection_type) { |
| 95 DCHECK(thread_checker_.CalledOnValidThread()); | 96 DCHECK(thread_checker_.CalledOnValidThread()); |
| 96 const ConnectionType actual_connection_type = ConvertConnectionType( | 97 const ConnectionType actual_connection_type = ConvertConnectionType( |
| 97 new_connection_type); | 98 new_connection_type); |
| 98 SetCurrentConnectionType(actual_connection_type); | 99 SetCurrentConnectionType(actual_connection_type); |
| 99 SetCurrentMaxBandwidth(Java_NetworkChangeNotifier_getCurrentMaxBandwidth( | |
| 100 env, java_network_change_notifier_.obj())); | |
| 101 observers_->Notify(&Observer::OnConnectionTypeChanged); | 100 observers_->Notify(&Observer::OnConnectionTypeChanged); |
| 102 } | 101 } |
| 103 | 102 |
| 104 jint NetworkChangeNotifierDelegateAndroid::GetConnectionType(JNIEnv*, | 103 jint NetworkChangeNotifierDelegateAndroid::GetConnectionType(JNIEnv*, |
| 105 jobject) const { | 104 jobject) const { |
| 106 DCHECK(thread_checker_.CalledOnValidThread()); | 105 DCHECK(thread_checker_.CalledOnValidThread()); |
| 107 return GetCurrentConnectionType(); | 106 return GetCurrentConnectionType(); |
| 108 } | 107 } |
| 109 | 108 |
| 109 void NetworkChangeNotifierDelegateAndroid::NotifyMaxBandwidthChanged( |
| 110 JNIEnv* env, |
| 111 jobject obj, |
| 112 jdouble new_max_bandwidth) { |
| 113 DCHECK(thread_checker_.CalledOnValidThread()); |
| 114 DCHECK(new_max_bandwidth != GetCurrentMaxBandwidth()); |
| 115 SetCurrentMaxBandwidth(new_max_bandwidth); |
| 116 observers_->Notify(&Observer::OnMaxBandwidthChanged, new_max_bandwidth); |
| 117 } |
| 118 |
| 110 void NetworkChangeNotifierDelegateAndroid::AddObserver( | 119 void NetworkChangeNotifierDelegateAndroid::AddObserver( |
| 111 Observer* observer) { | 120 Observer* observer) { |
| 112 observers_->AddObserver(observer); | 121 observers_->AddObserver(observer); |
| 113 } | 122 } |
| 114 | 123 |
| 115 void NetworkChangeNotifierDelegateAndroid::RemoveObserver( | 124 void NetworkChangeNotifierDelegateAndroid::RemoveObserver( |
| 116 Observer* observer) { | 125 Observer* observer) { |
| 117 observers_->RemoveObserver(observer); | 126 observers_->RemoveObserver(observer); |
| 118 } | 127 } |
| 119 | 128 |
| (...skipping 18 matching lines...) Expand all Loading... |
| 138 JNIEnv* env = base::android::AttachCurrentThread(); | 147 JNIEnv* env = base::android::AttachCurrentThread(); |
| 139 Java_NetworkChangeNotifier_forceConnectivityState(env, true); | 148 Java_NetworkChangeNotifier_forceConnectivityState(env, true); |
| 140 } | 149 } |
| 141 | 150 |
| 142 void NetworkChangeNotifierDelegateAndroid::SetOffline() { | 151 void NetworkChangeNotifierDelegateAndroid::SetOffline() { |
| 143 JNIEnv* env = base::android::AttachCurrentThread(); | 152 JNIEnv* env = base::android::AttachCurrentThread(); |
| 144 Java_NetworkChangeNotifier_forceConnectivityState(env, false); | 153 Java_NetworkChangeNotifier_forceConnectivityState(env, false); |
| 145 } | 154 } |
| 146 | 155 |
| 147 } // namespace net | 156 } // namespace net |
| OLD | NEW |