Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(392)

Side by Side Diff: net/proxy/proxy_config_service_android.h

Issue 26763005: android: Use new proxy from PROXY_CHANGE intent (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkgr
Patch Set: Catch NPE from intent.getExtras() Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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
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 // are either a host/port pair or ("", 0) to indicate "no proxy".
44 virtual void ProxySettingsChangedTo(JNIEnv*, jobject, jstring, jint) = 0;
45
46 // 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.
43 virtual void ProxySettingsChanged(JNIEnv*, jobject) = 0; 48 virtual void ProxySettingsChanged(JNIEnv*, jobject) = 0;
44 }; 49 };
45 50
46 ProxyConfigServiceAndroid(base::SequencedTaskRunner* network_task_runner, 51 ProxyConfigServiceAndroid(base::SequencedTaskRunner* network_task_runner,
47 base::SequencedTaskRunner* jni_task_runner); 52 base::SequencedTaskRunner* jni_task_runner);
48 53
49 virtual ~ProxyConfigServiceAndroid(); 54 virtual ~ProxyConfigServiceAndroid();
50 55
51 // Register JNI bindings. 56 // Register JNI bindings.
52 static bool Register(JNIEnv* env); 57 static bool Register(JNIEnv* env);
(...skipping 17 matching lines...) Expand all
70 void ProxySettingsChanged(); 75 void ProxySettingsChanged();
71 76
72 scoped_refptr<Delegate> delegate_; 77 scoped_refptr<Delegate> delegate_;
73 78
74 DISALLOW_COPY_AND_ASSIGN(ProxyConfigServiceAndroid); 79 DISALLOW_COPY_AND_ASSIGN(ProxyConfigServiceAndroid);
75 }; 80 };
76 81
77 } // namespace net 82 } // namespace net
78 83
79 #endif // NET_PROXY_PROXY_CONFIG_SERVICE_ANDROID_H_ 84 #endif // NET_PROXY_PROXY_CONFIG_SERVICE_ANDROID_H_
OLDNEW
« no previous file with comments | « net/android/java/src/org/chromium/net/ProxyChangeListener.java ('k') | net/proxy/proxy_config_service_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698