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 23 matching lines...) Expand all Loading... |
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) |
43 // are either a host/port pair or ("", 0) to indicate "no proxy". | 43 // are either a host/port pair or ("", 0) to indicate "no proxy". |
44 virtual void ProxySettingsChangedTo(JNIEnv*, jobject, jstring, jint) = 0; | 44 // The third parameter indicates the proxy exclusion list. |
| 45 virtual void ProxySettingsChangedTo( |
| 46 JNIEnv*, jobject, jstring, jint, jstring) = 0; |
45 | 47 |
46 // Called from Java (on JNI thread) to signal that the proxy settings have | 48 // Called from Java (on JNI thread) to signal that the proxy settings have |
47 // changed. New proxy settings are fetched from the system property store. | 49 // changed. New proxy settings are fetched from the system property store. |
48 virtual void ProxySettingsChanged(JNIEnv*, jobject) = 0; | 50 virtual void ProxySettingsChanged(JNIEnv*, jobject) = 0; |
49 }; | 51 }; |
50 | 52 |
51 ProxyConfigServiceAndroid(base::SequencedTaskRunner* network_task_runner, | 53 ProxyConfigServiceAndroid(base::SequencedTaskRunner* network_task_runner, |
52 base::SequencedTaskRunner* jni_task_runner); | 54 base::SequencedTaskRunner* jni_task_runner); |
53 | 55 |
54 virtual ~ProxyConfigServiceAndroid(); | 56 virtual ~ProxyConfigServiceAndroid(); |
(...skipping 20 matching lines...) Expand all Loading... |
75 void ProxySettingsChanged(); | 77 void ProxySettingsChanged(); |
76 | 78 |
77 scoped_refptr<Delegate> delegate_; | 79 scoped_refptr<Delegate> delegate_; |
78 | 80 |
79 DISALLOW_COPY_AND_ASSIGN(ProxyConfigServiceAndroid); | 81 DISALLOW_COPY_AND_ASSIGN(ProxyConfigServiceAndroid); |
80 }; | 82 }; |
81 | 83 |
82 } // namespace net | 84 } // namespace net |
83 | 85 |
84 #endif // NET_PROXY_PROXY_CONFIG_SERVICE_ANDROID_H_ | 86 #endif // NET_PROXY_PROXY_CONFIG_SERVICE_ANDROID_H_ |
OLD | NEW |