| 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/jni_string.h" | 9 #include "base/android/jni_string.h" |
| 10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
| 11 #include "base/bind.h" | 11 #include "base/bind.h" |
| 12 #include "base/callback.h" | 12 #include "base/callback.h" |
| 13 #include "base/compiler_specific.h" | 13 #include "base/compiler_specific.h" |
| 14 #include "base/location.h" | 14 #include "base/location.h" |
| 15 #include "base/logging.h" | 15 #include "base/logging.h" |
| 16 #include "base/memory/ref_counted.h" | 16 #include "base/memory/ref_counted.h" |
| 17 #include "base/observer_list.h" | 17 #include "base/observer_list.h" |
| 18 #include "base/sequenced_task_runner.h" | 18 #include "base/sequenced_task_runner.h" |
| 19 #include "base/strings/string_tokenizer.h" |
| 19 #include "base/strings/string_util.h" | 20 #include "base/strings/string_util.h" |
| 20 #include "base/strings/string_tokenizer.h" | |
| 21 #include "googleurl/src/url_parse.h" | |
| 22 #include "jni/ProxyChangeListener_jni.h" | 21 #include "jni/ProxyChangeListener_jni.h" |
| 23 #include "net/base/host_port_pair.h" | 22 #include "net/base/host_port_pair.h" |
| 24 #include "net/proxy/proxy_config.h" | 23 #include "net/proxy/proxy_config.h" |
| 24 #include "url/url_parse.h" |
| 25 | 25 |
| 26 using base::android::AttachCurrentThread; | 26 using base::android::AttachCurrentThread; |
| 27 using base::android::ConvertUTF8ToJavaString; | 27 using base::android::ConvertUTF8ToJavaString; |
| 28 using base::android::ConvertJavaStringToUTF8; | 28 using base::android::ConvertJavaStringToUTF8; |
| 29 using base::android::CheckException; | 29 using base::android::CheckException; |
| 30 using base::android::ClearException; | 30 using base::android::ClearException; |
| 31 using base::android::ScopedJavaGlobalRef; | 31 using base::android::ScopedJavaGlobalRef; |
| 32 | 32 |
| 33 namespace net { | 33 namespace net { |
| 34 | 34 |
| (...skipping 295 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 330 network_task_runner, jni_task_runner, get_property_callback)) { | 330 network_task_runner, jni_task_runner, get_property_callback)) { |
| 331 delegate_->SetupJNI(); | 331 delegate_->SetupJNI(); |
| 332 delegate_->FetchInitialConfig(); | 332 delegate_->FetchInitialConfig(); |
| 333 } | 333 } |
| 334 | 334 |
| 335 void ProxyConfigServiceAndroid::ProxySettingsChanged() { | 335 void ProxyConfigServiceAndroid::ProxySettingsChanged() { |
| 336 delegate_->ProxySettingsChanged(); | 336 delegate_->ProxySettingsChanged(); |
| 337 } | 337 } |
| 338 | 338 |
| 339 } // namespace net | 339 } // namespace net |
| OLD | NEW |