| 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 11 matching lines...) Expand all Loading... |
| 22 namespace net { | 22 namespace net { |
| 23 | 23 |
| 24 class ProxyConfig; | 24 class ProxyConfig; |
| 25 | 25 |
| 26 class NET_EXPORT ProxyConfigServiceAndroid : public ProxyConfigService { | 26 class NET_EXPORT ProxyConfigServiceAndroid : public ProxyConfigService { |
| 27 public: | 27 public: |
| 28 // Callback that returns the value of the property identified by the provided | 28 // Callback that returns the value of the property identified by the provided |
| 29 // key. If it was not found, an empty string is returned. Note that this | 29 // key. If it was not found, an empty string is returned. Note that this |
| 30 // interface does not let you distinguish an empty property from a | 30 // interface does not let you distinguish an empty property from a |
| 31 // non-existing property. This callback is invoked on the JNI thread. | 31 // non-existing property. This callback is invoked on the JNI thread. |
| 32 typedef base::Callback<std::string (const std::string& property)> | 32 typedef base::Callback<std::string(const std::string& property)> |
| 33 GetPropertyCallback; | 33 GetPropertyCallback; |
| 34 | 34 |
| 35 // Separate class whose instance is owned by the Delegate class implemented in | 35 // Separate class whose instance is owned by the Delegate class implemented in |
| 36 // the .cc file. | 36 // the .cc file. |
| 37 class JNIDelegate { | 37 class JNIDelegate { |
| 38 public: | 38 public: |
| 39 virtual ~JNIDelegate() {} | 39 virtual ~JNIDelegate() {} |
| 40 | 40 |
| 41 // Called from Java (on JNI thread) to signal that the proxy settings have | 41 // Called from Java (on JNI thread) to signal that the proxy settings have |
| 42 // changed. The string and int arguments (the host/port pair for the proxy) | 42 // changed. The string and int arguments (the host/port pair for the proxy) |
| (...skipping 29 matching lines...) Expand all Loading... |
| 72 GetPropertyCallback get_property_callback); | 72 GetPropertyCallback get_property_callback); |
| 73 | 73 |
| 74 // For tests. | 74 // For tests. |
| 75 void ProxySettingsChanged(); | 75 void ProxySettingsChanged(); |
| 76 | 76 |
| 77 scoped_refptr<Delegate> delegate_; | 77 scoped_refptr<Delegate> delegate_; |
| 78 | 78 |
| 79 DISALLOW_COPY_AND_ASSIGN(ProxyConfigServiceAndroid); | 79 DISALLOW_COPY_AND_ASSIGN(ProxyConfigServiceAndroid); |
| 80 }; | 80 }; |
| 81 | 81 |
| 82 } // namespace net | 82 } // namespace net |
| 83 | 83 |
| 84 #endif // NET_PROXY_PROXY_CONFIG_SERVICE_ANDROID_H_ | 84 #endif // NET_PROXY_PROXY_CONFIG_SERVICE_ANDROID_H_ |
| OLD | NEW |