diff options
| -rw-r--r-- | WebKit/android/jni/JavaBridge.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/WebKit/android/jni/JavaBridge.cpp b/WebKit/android/jni/JavaBridge.cpp index d27dbc7..2b44d69 100644 --- a/WebKit/android/jni/JavaBridge.cpp +++ b/WebKit/android/jni/JavaBridge.cpp @@ -109,7 +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); + static void UpdateProxy(JNIEnv* env, jobject obj, jstring newProxy, jstring newExList); private: @@ -455,12 +455,13 @@ void JavaBridge::RemovePackageName(JNIEnv* env, jobject obj, jstring packageName packageNotifier().removePackageName(jstringToWtfString(env, packageName)); } -void JavaBridge::UpdateProxy(JNIEnv* env, jobject obj, jstring newProxy) +void JavaBridge::UpdateProxy(JNIEnv* env, jobject obj, jstring newProxy, jstring newExList) { #if USE(CHROME_NETWORK_STACK) std::string proxy = jstringToStdString(env, newProxy); - WebCache::get(false)->proxy()->UpdateProxySettings(proxy); - WebCache::get(true)->proxy()->UpdateProxySettings(proxy); + std::string exList = jstringToStdString(env, newExList); + WebCache::get(false)->proxy()->UpdateProxySettings(proxy, exList); + WebCache::get(true)->proxy()->UpdateProxySettings(proxy, exList); #endif } @@ -494,7 +495,7 @@ static JNINativeMethod gWebCoreJavaBridgeMethods[] = { (void*) JavaBridge::AddPackageName }, { "removePackageName", "(Ljava/lang/String;)V", (void*) JavaBridge::RemovePackageName }, - { "updateProxy", "(Ljava/lang/String;)V", + { "nativeUpdateProxy", "(Ljava/lang/String;Ljava/lang/String;)V", (void*) JavaBridge::UpdateProxy } }; |