diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-12-21 06:45:30 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-12-21 06:45:30 -0800 |
| commit | 8de855dac638b409acd478137ec75018545c62fa (patch) | |
| tree | 57a978c09c0c247949ad48de79baec187b01058b /WebKit | |
| parent | 692664c44735e0ceab83f61e8ea447e685f2cf64 (diff) | |
| parent | 8c48faed200fc0ecd11e41fafcec0be167cf7f70 (diff) | |
| download | external_webkit-8de855dac638b409acd478137ec75018545c62fa.zip external_webkit-8de855dac638b409acd478137ec75018545c62fa.tar.gz external_webkit-8de855dac638b409acd478137ec75018545c62fa.tar.bz2 | |
Merge "Revert "Revert "Merge "Add a method java can send proxy changes to""""
Diffstat (limited to 'WebKit')
| -rw-r--r-- | WebKit/android/jni/JavaBridge.cpp | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/WebKit/android/jni/JavaBridge.cpp b/WebKit/android/jni/JavaBridge.cpp index ad2bc5d..ce16a0f 100644 --- a/WebKit/android/jni/JavaBridge.cpp +++ b/WebKit/android/jni/JavaBridge.cpp @@ -44,6 +44,7 @@ #ifdef ANDROID_INSTRUMENT #include "TimeCounter.h" #endif +#include "WebCache.h" #include "WebCoreJni.h" #include <JNIHelp.h> @@ -108,6 +109,7 @@ public: static void AddPackageNames(JNIEnv* env, jobject obj, jobject packageNames); static void AddPackageName(JNIEnv* env, jobject obj, jstring packageName); static void RemovePackageName(JNIEnv* env, jobject obj, jstring packageName); + static void UpdateProxy(JNIEnv* env, jobject obj, jstring newProxy); private: @@ -453,6 +455,15 @@ void JavaBridge::RemovePackageName(JNIEnv* env, jobject obj, jstring packageName packageNotifier().removePackageName(jstringToWtfString(env, packageName)); } +void JavaBridge::UpdateProxy(JNIEnv* env, jobject obj, jstring newProxy) +{ +#if USE(CHROME_NETWORK_STACK) + std::string proxy = jstringToStdString(env, newProxy); + WebCache::get(false)->proxy()->UpdateProxySettings(proxy); + WebCache::get(true)->proxy()->UpdateProxySettings(proxy); +#endif +} + // ---------------------------------------------------------------------------- @@ -482,7 +493,9 @@ static JNINativeMethod gWebCoreJavaBridgeMethods[] = { { "addPackageName", "(Ljava/lang/String;)V", (void*) JavaBridge::AddPackageName }, { "removePackageName", "(Ljava/lang/String;)V", - (void*) JavaBridge::RemovePackageName } + (void*) JavaBridge::RemovePackageName }, + { "updateProxy", "(Ljava/lang/String;)V", + (void*) JavaBridge::UpdateProxy } }; int registerJavaBridge(JNIEnv* env) |