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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/android/network_library.cc

Issue 10206014: Upstream Android proxy config service. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add proxy_test_cases.py Created 8 years, 8 months 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 side-by-side diff with in-line comments
Download patch
« net/android/java/org/chromium/net/ProxyChangeListener.java ('K') | « net/android/java/org/chromium/net/ProxyChangeListener.java ('k') | net/android/tools/proxy_test_cases.py » ('j') | net/net.gyp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/android/network_library.cc
diff --git a/net/android/network_library.cc b/net/android/network_library.cc
index 24a065e425c00afb40012d87bcc6f56fd94a4fd1..db8f05296214f6b0d569dd982566b20a8200e1b6 100644
--- a/net/android/network_library.cc
+++ b/net/android/network_library.cc
@@ -10,6 +10,7 @@
#include "base/android/scoped_java_ref.h"
#include "base/logging.h"
#include "jni/android_network_library_jni.h"
+#include "net/proxy/proxy_config_service_android.h"
using base::android::AttachCurrentThread;
using base::android::ClearException;
@@ -83,7 +84,8 @@ bool GetMimeTypeFromExtension(const std::string& extension,
}
bool RegisterNetworkLibrary(JNIEnv* env) {
- return RegisterNativesImpl(env);
+ return RegisterNativesImpl(env) &&
Yaron 2012/04/27 20:06:06 drive-by: This doesn't belong and we need to add a
+ ProxyConfigServiceAndroid::Init(env);
}
} // namespace android
« net/android/java/org/chromium/net/ProxyChangeListener.java ('K') | « net/android/java/org/chromium/net/ProxyChangeListener.java ('k') | net/android/tools/proxy_test_cases.py » ('j') | net/net.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698