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 21 matching lines...) Expand all Loading... |
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. | 42 // changed. The string and int arguments (the host/port pair for the proxy) |
43 virtual void ProxySettingsChanged(JNIEnv*, jobject) = 0; | 43 // are either a host/port pair or ("", 0) to indicate "no proxy". |
| 44 virtual void ProxySettingsChanged(JNIEnv*, jobject, jstring, jint) = 0; |
44 }; | 45 }; |
45 | 46 |
46 ProxyConfigServiceAndroid(base::SequencedTaskRunner* network_task_runner, | 47 ProxyConfigServiceAndroid(base::SequencedTaskRunner* network_task_runner, |
47 base::SequencedTaskRunner* jni_task_runner); | 48 base::SequencedTaskRunner* jni_task_runner); |
48 | 49 |
49 virtual ~ProxyConfigServiceAndroid(); | 50 virtual ~ProxyConfigServiceAndroid(); |
50 | 51 |
51 // Register JNI bindings. | 52 // Register JNI bindings. |
52 static bool Register(JNIEnv* env); | 53 static bool Register(JNIEnv* env); |
53 | 54 |
(...skipping 16 matching lines...) Expand all Loading... |
70 void ProxySettingsChanged(); | 71 void ProxySettingsChanged(); |
71 | 72 |
72 scoped_refptr<Delegate> delegate_; | 73 scoped_refptr<Delegate> delegate_; |
73 | 74 |
74 DISALLOW_COPY_AND_ASSIGN(ProxyConfigServiceAndroid); | 75 DISALLOW_COPY_AND_ASSIGN(ProxyConfigServiceAndroid); |
75 }; | 76 }; |
76 | 77 |
77 } // namespace net | 78 } // namespace net |
78 | 79 |
79 #endif // NET_PROXY_PROXY_CONFIG_SERVICE_ANDROID_H_ | 80 #endif // NET_PROXY_PROXY_CONFIG_SERVICE_ANDROID_H_ |
OLD | NEW |