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/proxy/proxy_config_service_android.h" | 5 #include "net/proxy/proxy_config_service_android.h" |
6 | 6 |
7 #include <sys/system_properties.h> | 7 #include <sys/system_properties.h> |
8 | 8 |
9 #include "base/android/context_utils.h" | 9 #include "base/android/context_utils.h" |
10 #include "base/android/jni_array.h" | 10 #include "base/android/jni_array.h" |
(...skipping 13 matching lines...) Expand all Loading... |
24 #include "jni/ProxyChangeListener_jni.h" | 24 #include "jni/ProxyChangeListener_jni.h" |
25 #include "net/base/host_port_pair.h" | 25 #include "net/base/host_port_pair.h" |
26 #include "net/proxy/proxy_config.h" | 26 #include "net/proxy/proxy_config.h" |
27 #include "url/third_party/mozilla/url_parse.h" | 27 #include "url/third_party/mozilla/url_parse.h" |
28 | 28 |
29 using base::android::AttachCurrentThread; | 29 using base::android::AttachCurrentThread; |
30 using base::android::ConvertUTF8ToJavaString; | 30 using base::android::ConvertUTF8ToJavaString; |
31 using base::android::ConvertJavaStringToUTF8; | 31 using base::android::ConvertJavaStringToUTF8; |
32 using base::android::CheckException; | 32 using base::android::CheckException; |
33 using base::android::ClearException; | 33 using base::android::ClearException; |
| 34 using base::android::JavaParamRef; |
34 using base::android::ScopedJavaGlobalRef; | 35 using base::android::ScopedJavaGlobalRef; |
| 36 using base::android::ScopedJavaLocalRef; |
35 | 37 |
36 namespace net { | 38 namespace net { |
37 | 39 |
38 namespace { | 40 namespace { |
39 | 41 |
40 typedef ProxyConfigServiceAndroid::GetPropertyCallback GetPropertyCallback; | 42 typedef ProxyConfigServiceAndroid::GetPropertyCallback GetPropertyCallback; |
41 | 43 |
42 // Returns whether the provided string was successfully converted to a port. | 44 // Returns whether the provided string was successfully converted to a port. |
43 bool ConvertStringToPort(const std::string& port, int* output) { | 45 bool ConvertStringToPort(const std::string& port, int* output) { |
44 url::Component component(0, port.size()); | 46 url::Component component(0, port.size()); |
(...skipping 360 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
405 network_task_runner, jni_task_runner, get_property_callback)) { | 407 network_task_runner, jni_task_runner, get_property_callback)) { |
406 delegate_->SetupJNI(); | 408 delegate_->SetupJNI(); |
407 delegate_->FetchInitialConfig(); | 409 delegate_->FetchInitialConfig(); |
408 } | 410 } |
409 | 411 |
410 void ProxyConfigServiceAndroid::ProxySettingsChanged() { | 412 void ProxyConfigServiceAndroid::ProxySettingsChanged() { |
411 delegate_->ProxySettingsChanged(); | 413 delegate_->ProxySettingsChanged(); |
412 } | 414 } |
413 | 415 |
414 } // namespace net | 416 } // namespace net |
OLD | NEW |