| 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 #ifndef NET_PROXY_PROXY_CONFIG_SERVICE_ANDROID_H_ | 5 #ifndef NET_PROXY_PROXY_CONFIG_SERVICE_ANDROID_H_ |
| 6 #define NET_PROXY_PROXY_CONFIG_SERVICE_ANDROID_H_ | 6 #define NET_PROXY_PROXY_CONFIG_SERVICE_ANDROID_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/android/jni_android.h" | 10 #include "base/android/jni_android.h" |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 57 const scoped_refptr<base::SequencedTaskRunner>& network_task_runner, | 57 const scoped_refptr<base::SequencedTaskRunner>& network_task_runner, |
| 58 const scoped_refptr<base::SequencedTaskRunner>& jni_task_runner); | 58 const scoped_refptr<base::SequencedTaskRunner>& jni_task_runner); |
| 59 | 59 |
| 60 virtual ~ProxyConfigServiceAndroid(); | 60 virtual ~ProxyConfigServiceAndroid(); |
| 61 | 61 |
| 62 // Register JNI bindings. | 62 // Register JNI bindings. |
| 63 static bool Register(JNIEnv* env); | 63 static bool Register(JNIEnv* env); |
| 64 | 64 |
| 65 // ProxyConfigService: | 65 // ProxyConfigService: |
| 66 // Called only on the network thread. | 66 // Called only on the network thread. |
| 67 virtual void AddObserver(Observer* observer) OVERRIDE; | 67 virtual void AddObserver(Observer* observer) override; |
| 68 virtual void RemoveObserver(Observer* observer) OVERRIDE; | 68 virtual void RemoveObserver(Observer* observer) override; |
| 69 virtual ConfigAvailability GetLatestProxyConfig(ProxyConfig* config) OVERRIDE; | 69 virtual ConfigAvailability GetLatestProxyConfig(ProxyConfig* config) override; |
| 70 | 70 |
| 71 private: | 71 private: |
| 72 friend class ProxyConfigServiceAndroidTestBase; | 72 friend class ProxyConfigServiceAndroidTestBase; |
| 73 class Delegate; | 73 class Delegate; |
| 74 | 74 |
| 75 // For tests. | 75 // For tests. |
| 76 ProxyConfigServiceAndroid( | 76 ProxyConfigServiceAndroid( |
| 77 const scoped_refptr<base::SequencedTaskRunner>& network_task_runner, | 77 const scoped_refptr<base::SequencedTaskRunner>& network_task_runner, |
| 78 const scoped_refptr<base::SequencedTaskRunner>& jni_task_runner, | 78 const scoped_refptr<base::SequencedTaskRunner>& jni_task_runner, |
| 79 GetPropertyCallback get_property_callback); | 79 GetPropertyCallback get_property_callback); |
| 80 | 80 |
| 81 // For tests. | 81 // For tests. |
| 82 void ProxySettingsChanged(); | 82 void ProxySettingsChanged(); |
| 83 | 83 |
| 84 scoped_refptr<Delegate> delegate_; | 84 scoped_refptr<Delegate> delegate_; |
| 85 | 85 |
| 86 DISALLOW_COPY_AND_ASSIGN(ProxyConfigServiceAndroid); | 86 DISALLOW_COPY_AND_ASSIGN(ProxyConfigServiceAndroid); |
| 87 }; | 87 }; |
| 88 | 88 |
| 89 } // namespace net | 89 } // namespace net |
| 90 | 90 |
| 91 #endif // NET_PROXY_PROXY_CONFIG_SERVICE_ANDROID_H_ | 91 #endif // NET_PROXY_PROXY_CONFIG_SERVICE_ANDROID_H_ |
| OLD | NEW |