diff options
| author | pliard@chromium.org <pliard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-06 12:57:44 +0000 |
|---|---|---|
| committer | pliard@chromium.org <pliard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-06 12:57:44 +0000 |
| commit | 45ab7abc0b8ae4d3a78637c158d98cd06b0a8f7a (patch) | |
| tree | f8fc5afc301734c421d361212329cc51ce2f7afc /base/android | |
| parent | 6d478b1e77dba59521c5eac87bad1e1f6055219d (diff) | |
| download | chromium_src-45ab7abc0b8ae4d3a78637c158d98cd06b0a8f7a.zip chromium_src-45ab7abc0b8ae4d3a78637c158d98cd06b0a8f7a.tar.gz chromium_src-45ab7abc0b8ae4d3a78637c158d98cd06b0a8f7a.tar.bz2 | |
Upstream Android proxy config service.
This change adds in an Android-specific system proxy provider called
ProxyConfigServiceAndroid. This is created as required from C++. In
turn ProxyConfigServiceAndroid creates a java object which provides
the link to Android's proxy changed broadcast, as well as the
functionality to read the Java system properties where the current
proxy settings are located.
Review URL: https://chromiumcodereview.appspot.com/10206014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140748 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/android')
| -rwxr-xr-x | base/android/jni_generator/jni_generator.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/base/android/jni_generator/jni_generator.py b/base/android/jni_generator/jni_generator.py index bf8b971..a444fdd 100755 --- a/base/android/jni_generator/jni_generator.py +++ b/base/android/jni_generator/jni_generator.py @@ -186,7 +186,6 @@ def JavaParamToJni(param): 'Lorg/chromium/media/MediaPlayerListener', 'Lorg/chromium/net/NetworkChangeNotifier', 'Lorg/chromium/net/ProxyChangeListener', - 'Lorg/chromium/net/NetworkChangeNotifier', ] if param == 'byte[][]': return '[[B' |