| 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_array.h" | 9 #include "base/android/jni_array.h" |
| 10 #include "base/android/jni_string.h" | 10 #include "base/android/jni_string.h" |
| (...skipping 337 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 348 return jni_task_runner_->RunsTasksOnCurrentThread(); | 348 return jni_task_runner_->RunsTasksOnCurrentThread(); |
| 349 } | 349 } |
| 350 | 350 |
| 351 bool OnNetworkThread() const { | 351 bool OnNetworkThread() const { |
| 352 return network_task_runner_->RunsTasksOnCurrentThread(); | 352 return network_task_runner_->RunsTasksOnCurrentThread(); |
| 353 } | 353 } |
| 354 | 354 |
| 355 ScopedJavaGlobalRef<jobject> java_proxy_change_listener_; | 355 ScopedJavaGlobalRef<jobject> java_proxy_change_listener_; |
| 356 | 356 |
| 357 JNIDelegateImpl jni_delegate_; | 357 JNIDelegateImpl jni_delegate_; |
| 358 ObserverList<Observer> observers_; | 358 base::ObserverList<Observer> observers_; |
| 359 scoped_refptr<base::SequencedTaskRunner> network_task_runner_; | 359 scoped_refptr<base::SequencedTaskRunner> network_task_runner_; |
| 360 scoped_refptr<base::SequencedTaskRunner> jni_task_runner_; | 360 scoped_refptr<base::SequencedTaskRunner> jni_task_runner_; |
| 361 GetPropertyCallback get_property_callback_; | 361 GetPropertyCallback get_property_callback_; |
| 362 ProxyConfig proxy_config_; | 362 ProxyConfig proxy_config_; |
| 363 bool exclude_pac_url_; | 363 bool exclude_pac_url_; |
| 364 | 364 |
| 365 DISALLOW_COPY_AND_ASSIGN(Delegate); | 365 DISALLOW_COPY_AND_ASSIGN(Delegate); |
| 366 }; | 366 }; |
| 367 | 367 |
| 368 ProxyConfigServiceAndroid::ProxyConfigServiceAndroid( | 368 ProxyConfigServiceAndroid::ProxyConfigServiceAndroid( |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 408 network_task_runner, jni_task_runner, get_property_callback)) { | 408 network_task_runner, jni_task_runner, get_property_callback)) { |
| 409 delegate_->SetupJNI(); | 409 delegate_->SetupJNI(); |
| 410 delegate_->FetchInitialConfig(); | 410 delegate_->FetchInitialConfig(); |
| 411 } | 411 } |
| 412 | 412 |
| 413 void ProxyConfigServiceAndroid::ProxySettingsChanged() { | 413 void ProxyConfigServiceAndroid::ProxySettingsChanged() { |
| 414 delegate_->ProxySettingsChanged(); | 414 delegate_->ProxySettingsChanged(); |
| 415 } | 415 } |
| 416 | 416 |
| 417 } // namespace net | 417 } // namespace net |
| OLD | NEW |