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

Unified Diff: android_webview/native/net_init_native_callback.cc

Issue 12377051: [android_webview] Don't intercept resource and asset URLRequests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 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
Index: android_webview/native/net_init_native_callback.cc
diff --git a/android_webview/native/net_init_native_callback.cc b/android_webview/native/net_init_native_callback.cc
index 585282f06b4232cad7b77bc4b0831818a43144c3..69cd5f30bd91d3c3baab2244f9529d86f25ec98a 100644
--- a/android_webview/native/net_init_native_callback.cc
+++ b/android_webview/native/net_init_native_callback.cc
@@ -7,16 +7,22 @@
#include "android_webview/browser/net/aw_url_request_job_factory.h"
#include "android_webview/native/android_protocol_handler.h"
#include "android_webview/native/cookie_manager.h"
-#include "net/url_request/url_request_job_factory.h"
namespace android_webview {
class AwURLRequestJobFactory;
-scoped_ptr<net::URLRequestJobFactory> CreateAndroidJobFactoryAndCookieMonster(
- net::URLRequestContext* context,
- scoped_ptr<AwURLRequestJobFactory> job_factory) {
+scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
+CreateAndroidAssetFileProtocolHandler() {
+ return CreateAssetFileProtocolHandler();
+}
+
+scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
+CreateAndroidContentProtocolHandler() {
+ return CreateContentSchemeProtocolHandler();
+}
+
+void CreateCookieMonster(net::URLRequestContext* context) {
SetCookieMonsterOnNetworkStackInit(context);
- return CreateAndroidRequestJobFactory(job_factory.Pass());
}
} // namespace android_webview

Powered by Google App Engine
This is Rietveld 408576698